diff --git a/plugins/docker-options/dockeroptions.go b/plugins/docker-options/dockeroptions.go
index c6b65e632..00c0fc906 100644
--- a/plugins/docker-options/dockeroptions.go
+++ b/plugins/docker-options/dockeroptions.go
@@ -105,18 +105,18 @@ func GetSpecifiedDockerOptionsForPhase(appName string, phase string, desiredOpti
 				break
 			}
 
-			parts := strings.SplitN(option, " ", 2)
-			if len(parts) != 2 {
-				common.LogWarn(fmt.Sprintf("Invalid docker option found for %s: %s", appName, option))
-				continue
-			}
-
 			// match options that are in the format "--option=value"
 			if strings.HasPrefix(option, fmt.Sprintf("%s=", desiredOption)) {
 				if _, ok := foundOptions[desiredOption]; !ok {
 					foundOptions[desiredOption] = []string{}
 				}
 
+				parts := strings.SplitN(option, "=", 2)
+				if len(parts) != 2 {
+					common.LogWarn(fmt.Sprintf("Invalid docker option found for %s: %s", appName, option))
+					continue
+				}
+
 				foundOptions[desiredOption] = append(foundOptions[desiredOption], parts[1])
 				break
 			}
@@ -127,6 +127,12 @@ func GetSpecifiedDockerOptionsForPhase(appName string, phase string, desiredOpti
 					foundOptions[desiredOption] = []string{}
 				}
 
+				parts := strings.SplitN(option, " ", 2)
+				if len(parts) != 2 {
+					common.LogWarn(fmt.Sprintf("Invalid docker option found for %s: %s", appName, option))
+					continue
+				}
+
 				foundOptions[desiredOption] = append(foundOptions[desiredOption], parts[1])
 				break
 			}