--- a/testing/marionette/driver.js
+++ b/testing/marionette/driver.js
@@ -711,16 +711,17 @@ GeckoDriver.prototype.setUpProxy = funct
 
       case "SYSTEM":
         Preferences.set("network.proxy.type", 5);
         break;
 
       case "NOPROXY":
       default:
         Preferences.set("network.proxy.type", 0);
+        break;
     }
   } else {
     throw new InvalidArgumentError("Value of 'proxy' should be an object");
   }
 };
 
 /**
  * Log message.  Accepts user defined log-level.
@@ -2624,17 +2625,16 @@ GeckoDriver.prototype.takeScreenshot = f
       context.drawWindow(win, 0, 0, width, height, "rgb(255,255,255)", flags);
       let dataUrl = canvas.toDataURL("image/png", "");
       let data = dataUrl.substring(dataUrl.indexOf(",") + 1);
       resp.body.value = data;
       break;
 
     case Context.CONTENT:
       return this.listener.takeScreenshot(id, full, highlights);
-      break;
   }
 };
 
 /**
  * Get the current browser orientation.
  *
  * Will return one of the valid primary orientation values
  * portrait-primary, landscape-primary, portrait-secondary, or