diff --git a/diaspora/Diaspora_Connection.php b/diaspora/Diaspora_Connection.php
index 67bc63df..a33bf608 100644
--- a/diaspora/Diaspora_Connection.php
+++ b/diaspora/Diaspora_Connection.php
@@ -46,7 +46,11 @@ class Diaspora_Connection {
 	public function setDiasporaID($id) {
 		$parts = explode('@', $id);
 		$this->user = $parts[0];
-		$this->host = $parts[1];
+		if (count($parts) > 1) {
+			$this->host = $parts[1];
+		} else {
+			$this->host = '';
+		}
 	}
 
 	public function getDiasporaID() {