diff --git a/src/calamares/testmain.cpp b/src/calamares/testmain.cpp
index 4dcbfea96..c22342f9a 100644
--- a/src/calamares/testmain.cpp
+++ b/src/calamares/testmain.cpp
@@ -162,7 +162,7 @@ main( int argc, char* argv[] )
     Calamares::Module* m = load_module( module );
     if ( !m )
     {
-        cError() << "No module.desc data found in" << module.moduleName();
+        cError() << "Could not load module" << module.moduleName();
         return 1;
     }
 
diff --git a/src/libcalamaresui/modulesystem/Module.cpp b/src/libcalamaresui/modulesystem/Module.cpp
index f80f4d48b..05394e69f 100644
--- a/src/libcalamaresui/modulesystem/Module.cpp
+++ b/src/libcalamaresui/modulesystem/Module.cpp
@@ -86,7 +86,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
 #ifdef WITH_PYTHONQT
             m = new PythonQtViewModule();
 #else
-            cError() << "PythonQt modules are not supported in this version of Calamares.";
+            cError() << "PythonQt view modules are not supported in this version of Calamares.";
 #endif
         }
         else
@@ -118,7 +118,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
 
     if ( !m )
     {
-        cDebug() << "Bad module type (" << typeString
+        cError() << "Bad module type (" << typeString
             << ") or interface string (" << intfString
             << ") for module " << instanceId;
         return nullptr;
@@ -129,8 +129,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
         m->m_directory = moduleDir.absolutePath();
     else
     {
-        cError() << "Bad module directory" << moduleDirectory
-               << "for" << instanceId;
+        cError() << "Bad module directory" << moduleDirectory << "for" << instanceId;
         delete m;
         return nullptr;
     }
@@ -144,7 +143,7 @@ Module::fromDescriptor( const QVariantMap& moduleDescriptor,
     }
     catch ( YAML::Exception& e )
     {
-        cWarning() << "YAML parser error " << e.what();
+        cError() << "YAML parser error " << e.what();
         delete m;
         return nullptr;
     }