diff --git a/notifications/handlers.py b/notifications/handlers.py
index 9d11ad69..720ed07c 100644
--- a/notifications/handlers.py
+++ b/notifications/handlers.py
@@ -13,7 +13,8 @@ class NotificationHandler(logging.Handler):
                 notif.title = "%s [%s:%s]" % (record.levelname, record.funcName, record.lineno)
                 notif.level = str([item[0] for item in Notification.LEVEL_CHOICES if item[1] == record.levelname][0])
                 message = record.getMessage()
-                message = message + "\n\n"
-                message = message + record.exc_text
+                if record.exc_text:
+                    message = message + "\n\n"
+                    message = message + record.exc_text
                 notif.message = message
                 notif.save()
diff --git a/services/managers/openfire_manager.py b/services/managers/openfire_manager.py
index f82f69c3..4c2a2c63 100755
--- a/services/managers/openfire_manager.py
+++ b/services/managers/openfire_manager.py
@@ -103,6 +103,8 @@ class OpenfireManager:
         remote_groups = []
         if response:
             remote_groups = response['groupname']
+            if isinstance(remote_groups, basestring):
+                remote_groups = [remote_groups]
         logger.debug("Openfire user %s has groups %s" % (username, remote_groups))
         add_groups = []
         del_groups = []