1 files changed, 10 insertions, 4 deletions
diff --git a/cli/mmcli-modem-messaging.c b/cli/mmcli-modem-messaging.c
index b8052e07..f717552c 100644
--- a/cli/mmcli-modem-messaging.c
+++ b/cli/mmcli-modem-messaging.c
@@ -120,11 +120,17 @@ context_free (Context *ctx)
 static void
 ensure_modem_messaging (void)
 {
-    if (ctx->modem_messaging)
-        return;
+    if (mm_modem_get_unlock_required (mm_object_peek_modem (ctx->object)) != MM_MODEM_LOCK_NONE) {
+        g_printerr ("error: modem not unlocked yet\n");
+        exit (EXIT_FAILURE);
+    }
+
+    if (!ctx->modem_messaging) {
+        g_printerr ("error: modem has no messaging capabilities\n");
+        exit (EXIT_FAILURE);
+    }
 
-    g_printerr ("error: modem has no messaging capabilities\n");
-    exit (EXIT_FAILURE);
+    /* Success */
 }
 
 void