diff --git a/src/pattern.js b/src/pattern.js
index d5c0b2200f3..9339a111f92 100644
--- a/src/pattern.js
+++ b/src/pattern.js
@@ -147,7 +147,9 @@ Pattern.prototype.sampleOption = function(optionName) {
   let parts = this.sampleParts();
   let option = this.config.options[optionName];
   if (typeof option.min === "undefined" || typeof option.max === "undefined") {
-    throw "Cannot sample an option without min and max values";
+    let min = option * 0.9;
+    let max = option * 1.1;
+    option = { min, max };
   }
   if (typeof option.pct !== "undefined") factor = 100;
   val = option.min / factor;
diff --git a/tests/pattern.test.js b/tests/pattern.test.js
index f045b503ef6..3ec431c5db9 100644
--- a/tests/pattern.test.js
+++ b/tests/pattern.test.js
@@ -98,7 +98,6 @@ it("Should sample an option", () => {
   pattern.sample();
   expect(pattern.parts.a.paths.test_1.render).to.equal(true);
   expect(pattern.parts.b.paths.test_10.ops[1].to.y).to.equal(10);
-  expect(() => pattern.sampleOption("bonus")).to.throw();
 });
 
 it("Should sample a measurement", () => {