diff --git a/src/command/command.c b/src/command/command.c
index ab1d28ce..3ed18651 100644
--- a/src/command/command.c
+++ b/src/command/command.c
@@ -2680,10 +2680,15 @@ _cmd_join(gchar **args, struct cmd_help_t help)
         return TRUE;
     }
 
+    Jid *room_arg = jid_create(args[0]);
+    if (room_arg == NULL) {
+        cons_show_error("Specified room has incorrect format");
+        return TRUE;
+    }
+
     int num_args = g_strv_length(args);
     char *room = NULL;
     char *nick = NULL;
-    Jid *room_arg = jid_create(args[0]);
     GString *room_str = g_string_new("");
     Jid *my_jid = jid_create(jabber_get_fulljid());
 
diff --git a/src/ui/core.c b/src/ui/core.c
index 126fe127..83839952 100644
--- a/src/ui/core.c
+++ b/src/ui/core.c
@@ -399,10 +399,12 @@ ui_incoming_msg(const char * const from, const char * const message,
             if (tv_stamp == NULL) {
                 win_print_time(window, '-');
             } else {
-                // if show users status first, when receiving message via delayed delivery
+                // show users status first, when receiving message via delayed delivery
                 if (win_created) {
                     PContact pcontact = roster_get_contact(from);
-                    win_show_contact(window, pcontact);
+                    if (pcontact != NULL) {
+                        win_show_contact(window, pcontact);
+                    }
                 }
                 GDateTime *time = g_date_time_new_from_timeval_utc(tv_stamp);
                 gchar *date_fmt = g_date_time_format(time, "%H:%M:%S");