diff --git a/src/main/java/com/sleekbyte/tailor/common/Messages.java b/src/main/java/com/sleekbyte/tailor/common/Messages.java
index 8f3d4028..bc3b0ba4 100644
--- a/src/main/java/com/sleekbyte/tailor/common/Messages.java
+++ b/src/main/java/com/sleekbyte/tailor/common/Messages.java
@@ -173,9 +173,11 @@ public class Messages {
     public static final String ERRORS_KEY = "errors";
     public static final String WARNINGS_KEY = "warnings";
 
-    // CLI options
+    // Error messags
     public static final String NO_SWIFT_FILES_FOUND = "No Swift source files were found.";
     public static final String COULD_NOT_BE_PARSED = " could not be parsed successfully, skipping...";
+
+    // CLI options
     public static final String SYNTAX_PREFIX = "Usage: ";
     public static final String OPTIONS_PREFIX = "Options:";
     public static final int HELP_WIDTH = 99;
diff --git a/src/main/java/com/sleekbyte/tailor/common/YamlConfiguration.java b/src/main/java/com/sleekbyte/tailor/common/YamlConfiguration.java
index 683aac53..fa8685f3 100644
--- a/src/main/java/com/sleekbyte/tailor/common/YamlConfiguration.java
+++ b/src/main/java/com/sleekbyte/tailor/common/YamlConfiguration.java
@@ -20,7 +20,7 @@ public final class YamlConfiguration {
     private Set<String> except = new HashSet<>();
     private String format = "";
     private boolean debug = false;
-    private String color = null;
+    private String color = "";
 
     public String getFormat() {
         return format;
diff --git a/src/main/java/com/sleekbyte/tailor/utils/Configuration.java b/src/main/java/com/sleekbyte/tailor/utils/Configuration.java
index 004bab0d..5dd11ffe 100644
--- a/src/main/java/com/sleekbyte/tailor/utils/Configuration.java
+++ b/src/main/java/com/sleekbyte/tailor/utils/Configuration.java
@@ -65,7 +65,9 @@ public boolean shouldListFiles() {
      */
     public boolean shouldColorOutput() {
         boolean shouldColorOutput = cliArgumentParser.shouldColorOutput();
-        if (shouldColorOutput && yamlConfiguration.isPresent() && yamlConfiguration.get().getColor() != null) {
+        if (shouldColorOutput
+            && yamlConfiguration.isPresent()
+            && !yamlConfiguration.get().getColor().isEmpty()) {
             String option = yamlConfiguration.get().getColor();
             validateColorOption(option);
             if (option.equals(Messages.DISABLE)) {
@@ -82,7 +84,9 @@ public boolean shouldColorOutput() {
      */
     public boolean shouldInvertColorOutput() {
         boolean shouldInvertColorOutput = cliArgumentParser.shouldInvertColorOutput();
-        if (!shouldInvertColorOutput && yamlConfiguration.isPresent() && yamlConfiguration.get().getColor() != null) {
+        if (!shouldInvertColorOutput
+            && yamlConfiguration.isPresent()
+            && !yamlConfiguration.get().getColor().isEmpty()) {
             String option = yamlConfiguration.get().getColor();
             validateColorOption(option);
             if (option.equals(Messages.INVERT)) {