diff --git a/src/modules/shellprocess/ShellProcessJob.cpp b/src/modules/shellprocess/ShellProcessJob.cpp
index cf6d8d606..b5a04037c 100644
--- a/src/modules/shellprocess/ShellProcessJob.cpp
+++ b/src/modules/shellprocess/ShellProcessJob.cpp
@@ -118,8 +118,10 @@ ShellProcessJob::setConfigurationMap( const QVariantMap& configurationMap )
     {
         m_commands = new CommandList( configurationMap.value( "script" ) );
         if ( m_commands->isEmpty() )
-            cDebug() << "ShellProcessJob: \"script\" contains no commands.";
+            cDebug() << "ShellProcessJob: \"script\" contains no commands for" << moduleInstanceKey();
     }
+    else
+        cDebug() << "WARNING: No script given for ShellProcessJob" << moduleInstanceKey();
 }
 
 CALAMARES_PLUGIN_FACTORY_DEFINITION( ShellProcessJobFactory, registerPlugin<ShellProcessJob>(); )