diff --git a/gajim/common/modules/delimiter.py b/gajim/common/modules/delimiter.py
index c66b24656a1fbb6f25d50288c71fa5deccc014f8..3c4c8b7a57fa3de7ba16ef94deb8ccfb2bd77341 100644
--- a/gajim/common/modules/delimiter.py
+++ b/gajim/common/modules/delimiter.py
@@ -16,7 +16,6 @@
 
 
 from nbxmpp.errors import is_error
-from nbxmpp.modules.util import raise_if_error
 
 from gajim.common.modules.base import BaseModule
 from gajim.common.modules.util import as_task
@@ -42,7 +41,10 @@ def get_roster_delimiter(self):
         delimiter = yield self.request_delimiter()
         if is_error(delimiter) or delimiter is None:
             result = yield self.set_delimiter(self.delimiter)
-            raise_if_error(result)
+            if is_error(result):
+                self._con.connect_machine()
+                return
+
             delimiter = self.delimiter
 
         self.delimiter = delimiter