diff --git a/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederMode.java b/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederMode.java
index 329f06613d4..810d2b3c0bf 100644
--- a/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederMode.java
+++ b/ambari-logsearch-logfeeder/src/main/java/org/apache/ambari/logfeeder/conf/LogFeederMode.java
@@ -40,12 +40,16 @@ public String getText() {
   }
 
   public static LogFeederMode fromString(String text) {
-    for (LogFeederMode mode : LogFeederMode.values()) {
-      if (mode.text.equalsIgnoreCase(text)) {
-        return mode;
+    try {
+      for (LogFeederMode mode : LogFeederMode.values()) {
+        if (mode.text.equalsIgnoreCase(text)) {
+          return mode;
+        }
       }
+    } catch (IllegalArgumentException e) {
+      return LogFeederMode.DEFAULT;
     }
-    throw new IllegalArgumentException(String.format("String '%s' cannot be converted to LogFeederMode enum", text));
+    return LogFeederMode.DEFAULT;
   }
 
   public static boolean isCloudStorage(LogFeederMode mode) {