diff --git a/.travis.yml b/.travis.yml
index 671191a63..607b00a05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,10 @@ php:
   - 5.5
   - 5.6
   - 7.0
+  - 7.1
+  - 7.2
   - hhvm
+  - nightly
 
 env:
   global:
@@ -26,6 +29,7 @@ script: $TEST_COMMAND
 matrix:
   allow_failures:
     - php: hhvm
+    - php: nightly
   fast_finish: true
   include:
     - php: 5.4
diff --git a/src/Message/MessageFactory.php b/src/Message/MessageFactory.php
index d469ef1e6..b366d6d31 100644
--- a/src/Message/MessageFactory.php
+++ b/src/Message/MessageFactory.php
@@ -194,7 +194,7 @@ protected function applyOptions(
             case 'allow_redirects':
 
                 if ($value === false) {
-                    continue;
+                    continue 2;
                 }
 
                 if ($value === true) {
@@ -213,7 +213,7 @@ protected function applyOptions(
             case 'decode_content':
 
                 if ($value === false) {
-                    continue;
+                    continue 2;
                 }
 
                 $config['decode_content'] = true;
@@ -251,7 +251,7 @@ protected function applyOptions(
             case 'auth':
 
                 if (!$value) {
-                    continue;
+                    continue 2;
                 }
 
                 if (is_array($value)) {
@@ -354,7 +354,7 @@ protected function applyOptions(
                 if (isset($this->customOptions[$key])) {
                     $fn = $this->customOptions[$key];
                     $fn($request, $value);
-                    continue;
+                    continue 2;
                 }
 
                 throw new Iae("No method can handle the {$key} config key");