diff --git a/src/AbstractShaderProgram.cpp b/src/AbstractShaderProgram.cpp
index 309a77686..0394690e1 100644
--- a/src/AbstractShaderProgram.cpp
+++ b/src/AbstractShaderProgram.cpp
@@ -152,13 +152,19 @@ void AbstractShaderProgram::link() {
 
     /* Show error log and delete shader */
     if(status == GL_FALSE) {
-        Error() << "AbstractShaderProgram: linking failed with the following message:\n"
-                << message;
+        Error out;
+        out.setFlag(Debug::NewLineAtTheEnd, false);
+        out.setFlag(Debug::SpaceAfterEachValue, false);
+        out << "AbstractShaderProgram: linking failed with the following message:\n"
+            << message;
 
     /* Or just warnings, if there are any */
     } else if(message[0] != 0) {
-        Debug() << "AbstractShaderProgram: linking succeeded with the following message:\n"
-                << message;
+        Debug out;
+        out.setFlag(Debug::NewLineAtTheEnd, false);
+        out.setFlag(Debug::SpaceAfterEachValue, false);
+        out << "AbstractShaderProgram: linking succeeded with the following message:\n"
+            << message;
     }
 
     state = status == GL_FALSE ? Failed : Linked;
diff --git a/src/Shader.cpp b/src/Shader.cpp
index 12d6d1b22..9381afcb2 100644
--- a/src/Shader.cpp
+++ b/src/Shader.cpp
@@ -149,14 +149,17 @@ GLuint Shader::compile() {
             case Type::Fragment:    err << "fragment";      break;
         }
 
+        err.setFlag(Debug::NewLineAtTheEnd, false);
+        err.setFlag(Debug::SpaceAfterEachValue, false);
+
         /* Show error log and delete shader */
         if(status == GL_FALSE) {
-            err << "shader failed to compile with the following message:\n"
+            err << " shader failed to compile with the following message:\n"
                 << message;
 
         /* Or just warnings, if there are any */
         } else if(message[0] != 0) {
-            err << "shader was successfully compiled with the following message:\n"
+            err << " shader was successfully compiled with the following message:\n"
                 << message;
         }
     }