diff --git a/backends/twitter/TwitterPlugin.cpp b/backends/twitter/TwitterPlugin.cpp
index 320da9de7b37212545ea8978fc60650c179e4304..e742d9dc2809191e853a59e24f83434d13a6cdae 100644
--- a/backends/twitter/TwitterPlugin.cpp
+++ b/backends/twitter/TwitterPlugin.cpp
@@ -594,6 +594,7 @@ std::string TwitterPlugin::getMostRecentDMIDUnsafe(const std::string user) {
 			}
 		}
 	}
+	return ID;
 }
 
 std::string TwitterPlugin::getMostRecentDMID(const std::string user)
diff --git a/src/networkpluginserver.cpp b/src/networkpluginserver.cpp
index 4ea242e6628988ba51f9ff29fa2148997fa7d7d9..28cea64b2f30487588a405d0adfbe48650918a45 100644
--- a/src/networkpluginserver.cpp
+++ b/src/networkpluginserver.cpp
@@ -1077,7 +1077,11 @@ void NetworkPluginServer::handleElement(boost::shared_ptr<Swift::Element> elemen
 		}
 		else {
 			Swift::Presence::ref highest = m_component->getPresenceOracle()->getHighestPriorityPresence(user->getJID());
-			iq->setTo(highest->getFrom());
+			if (highest) {
+			    iq->setTo(highest->getFrom());
+			} else {
+			    iq->setTo(user->getJID());
+			}
 		}
 		m_component->getIQRouter()->sendIQ(iq);
 		return;