diff --git a/src/ol/style/polygon.js b/src/ol/style/polygon.js
index 6c1a296ccb..6819fff56f 100644
--- a/src/ol/style/polygon.js
+++ b/src/ol/style/polygon.js
@@ -95,17 +95,23 @@ ol.style.Polygon = function(options) {
   if (goog.isDefAndNotNull(options.strokeColor) ||
       goog.isDefAndNotNull(options.strokeWidth)) {
 
-    strokeColor = !goog.isDefAndNotNull(options.strokeColor) ?
-        new ol.expression.Literal(ol.style.PolygonDefaults.strokeColor) :
-        (options.strokeColor instanceof ol.expression.Expression) ?
-            options.strokeColor :
-            new ol.expression.Literal(options.strokeColor);
+    if (goog.isDefAndNotNull(options.strokeColor)) {
+      strokeColor = (options.strokeColor instanceof ol.expression.Expression) ?
+          options.strokeColor :
+          new ol.expression.Literal(options.strokeColor);
+    } else {
+      strokeColor = new ol.expression.Literal(
+          /** @type {string} */ (ol.style.PolygonDefaults.strokeColor));
+    }
 
-    strokeWidth = !goog.isDef(options.strokeWidth) ?
-        new ol.expression.Literal(ol.style.PolygonDefaults.strokeWidth) :
-        (options.strokeWidth instanceof ol.expression.Expression) ?
-            options.strokeWidth :
-            new ol.expression.Literal(options.strokeWidth);
+    if (goog.isDefAndNotNull(options.strokeWidth)) {
+      strokeWidth = (options.strokeWidth instanceof ol.expression.Expression) ?
+          options.strokeWidth :
+          new ol.expression.Literal(options.strokeWidth);
+    } else {
+      strokeWidth = new ol.expression.Literal(
+          /** @type {number} */ (ol.style.PolygonDefaults.strokeWidth));
+    }
   }
 
   /**
diff --git a/src/ol/style/shape.js b/src/ol/style/shape.js
index a2b2ea9063..b1ff0e1bf3 100644
--- a/src/ol/style/shape.js
+++ b/src/ol/style/shape.js
@@ -130,17 +130,24 @@ ol.style.Shape = function(options) {
   if (goog.isDefAndNotNull(options.strokeColor) ||
       goog.isDefAndNotNull(options.strokeWidth)) {
 
-    strokeColor = !goog.isDefAndNotNull(options.strokeColor) ?
-        new ol.expression.Literal(ol.style.ShapeDefaults.strokeColor) :
-        (options.strokeColor instanceof ol.expression.Expression) ?
-            options.strokeColor :
-            new ol.expression.Literal(options.strokeColor);
+    if (goog.isDefAndNotNull(options.strokeColor)) {
+      strokeColor = (options.strokeColor instanceof ol.expression.Expression) ?
+          options.strokeColor :
+          new ol.expression.Literal(options.strokeColor);
+    } else {
+      strokeColor = new ol.expression.Literal(
+          /** @type {string} */ (ol.style.ShapeDefaults.strokeColor));
+    }
+
+    if (goog.isDefAndNotNull(options.strokeWidth)) {
+      strokeWidth = (options.strokeWidth instanceof ol.expression.Expression) ?
+          options.strokeWidth :
+          new ol.expression.Literal(options.strokeWidth);
+    } else {
+      strokeWidth = new ol.expression.Literal(
+          /** @type {number} */ (ol.style.ShapeDefaults.strokeWidth));
+    }
 
-    strokeWidth = !goog.isDef(options.strokeWidth) ?
-        new ol.expression.Literal(ol.style.ShapeDefaults.strokeWidth) :
-        (options.strokeWidth instanceof ol.expression.Expression) ?
-            options.strokeWidth :
-            new ol.expression.Literal(options.strokeWidth);
   }
 
   /**
diff --git a/test/spec/ol/expression/expression.test.js b/test/spec/ol/expression/expression.test.js
index f353a6b004..1c73a46ee5 100644
--- a/test/spec/ol/expression/expression.test.js
+++ b/test/spec/ol/expression/expression.test.js
@@ -534,3 +534,4 @@ goog.require('ol.expression.Math');
 goog.require('ol.expression.Member');
 goog.require('ol.expression.Not');
 goog.require('ol.expression.TokenType');
+goog.require('ol.expression.UnexpectedToken');
diff --git a/test/spec/ol/expression/lexer.test.js b/test/spec/ol/expression/lexer.test.js
index a9615ec897..828a58726c 100644
--- a/test/spec/ol/expression/lexer.test.js
+++ b/test/spec/ol/expression/lexer.test.js
@@ -9,7 +9,7 @@ describe('ol.expression.Lexer', function() {
     });
   });
 
-  describe.only('#next()', function() {
+  describe('#next()', function() {
 
     it('returns one token at a time', function() {
       var source = 'foo === "bar"';
@@ -41,7 +41,7 @@ describe('ol.expression.Lexer', function() {
 
   });
 
-  describe.only('#peek()', function() {
+  describe('#peek()', function() {
 
     var lexer;
     beforeEach(function() {