diff --git a/jabber.py b/jabber.py
index 83b53d8..78950b8 100644
--- a/jabber.py
+++ b/jabber.py
@@ -1766,37 +1766,40 @@ def jabber_cmd_jchat(data, buffer, args):
 def jabber_cmd_room(data, buffer, args):
     """ Command '/jroom'. """
     global jabber_config_file
-    if args:
-        argv = args.split()
-        room = argv[0]
-        autojoin = "-autojoin" in argv
-        if len(argv) == 1:
-            nickname = None
-        elif len(argv) == 2:
-            nickname = argv[1] if argv[1] != "-autojoin" else None
-            autojoin = argv[1] == "-autojoin"
-        else:
-            nickname = argv[1]
-            autojoin = argv[2]
-        context = jabber_search_context(buffer)
-        server = context["server"]
-        if server:
-            buddy = server.search_buddy_list(args, by='alias')
-            if not buddy:
-                buddy = server.add_muc(room, nickname)
-            if not buddy.chat:
-                server.add_chat(buddy)
-            if autojoin:
-                autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
-                autojoins.append(room)
-                autojoins = ", ".join(autojoins)
-                r = weechat.config_option_set(server.options["autojoin"], autojoins, 1)
-            weechat.buffer_set(buddy.chat.buffer, "display", "auto")
-            weechat.buffer_set(buddy.chat.buffer, "nicklist", "1")
-            weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1")
-            weechat.buffer_set(buddy.chat.buffer, "display", "auto")
-    else:
+
+    if not args:
         weechat.prnt("", "Usage: /jroom <roomname>@conference.<server_FQDN> [<optional_user_nickname>]")
+        return weechat.WEECHAT_RC_OK
+
+    argv = args.split()
+    room = argv[0]
+    autojoin = "-autojoin" in argv
+    if len(argv) == 1:
+        nickname = None
+    elif len(argv) == 2:
+        nickname = argv[1] if argv[1] != "-autojoin" else None
+        autojoin = argv[1] == "-autojoin"
+    else:
+        nickname = argv[1]
+        autojoin = argv[2]
+    context = jabber_search_context(buffer)
+    server = context["server"]
+    if server:
+        buddy = server.search_buddy_list(args, by='alias')
+        if not buddy:
+            buddy = server.add_muc(room, nickname)
+        if not buddy.chat:
+            server.add_chat(buddy)
+        if autojoin:
+            autojoins = [r.strip() for r in server.option_string("autojoin").split(',')]
+            autojoins.append(room)
+            autojoins = ", ".join(autojoins)
+            r = weechat.config_option_set(server.options["autojoin"], autojoins, 1)
+        weechat.buffer_set(buddy.chat.buffer, "display", "auto")
+        weechat.buffer_set(buddy.chat.buffer, "nicklist", "1")
+        weechat.buffer_set(buddy.chat.buffer, "nicklist_display_groups", "1")
+        weechat.buffer_set(buddy.chat.buffer, "display", "auto")
+
     return weechat.WEECHAT_RC_OK