diff --git a/compositor-message/main.cpp b/compositor-message/main.cpp
index 1a3bad738315e43b000d8c15cd748633c6054663..b3b27213c0bbeb77c35714cc6f390f0e1c693ea2 100644
--- a/compositor-message/main.cpp
+++ b/compositor-message/main.cpp
@@ -24,17 +24,22 @@ int main(int argc, char *argv[])
     }
 
     QString command;
-    bool ok;
+    bool ok = false;
     qint32 windowid = -1;
     qint32 screenid = -1;
 
     command = QString(args[0]);
-    windowid = qint32(args[1].toInt(&ok));
-    if(ok){
-        if(args.length() > 2){
-            screenid = qint32(args[2].toInt(&ok));
+    if(args.length() > 1){
+        windowid = qint32(args[1].toInt(&ok));
+        if(ok){
+            if(args.length() > 2){
+                screenid = qint32(args[2].toInt(&ok));
+            }
         }
     }
+    else
+        ok = true;
+
     if(! ok){
         QTextStream(stdout) << "windowid or screenid could not be parsed as integer.";
         parser.showHelp();
diff --git a/multiscreen-compositor/qml/main.qml b/multiscreen-compositor/qml/main.qml
index d552cedfc03791868afa205718f5a94d33be1918..294435726b344ba46d79805af0f9f1fc77ddd784 100644
--- a/multiscreen-compositor/qml/main.qml
+++ b/multiscreen-compositor/qml/main.qml
@@ -405,7 +405,7 @@ WaylandCompositor {
             var affectedSurfaces = getActiveSurfaces(getPidFromIviId(windowid));
             if (affectedSurfaces.length === 0)
             {
-                console.log("no screens found for ID", windowid);
+                console.log("no screens found for IVI ID", windowid);
                 server.returnStatus(-1);
                 return;
             }