diff --git a/src/test/java/javascalautils/TestSome.java b/src/test/java/javascalautils/TestSome.java
index <HASH>..<HASH> 100644
--- a/src/test/java/javascalautils/TestSome.java
+++ b/src/test/java/javascalautils/TestSome.java
@@ -126,6 +126,13 @@ public class TestSome extends BaseAssert {
         assertEquals(TEXT_VALUE.length(), mapped.get().intValue());
     }
 
+    @Test(expected = BrokenFunctionException.class)
+    public void map_fail() {
+        option.map(v -> {
+            throw new Exception("Oh darn, this went FUBAR!");
+        });
+    }
+
     @Test
     public void flatMap() {
         Option<Integer> mapped = option.flatMap(v -> Option.apply(v.length()));
@@ -133,6 +140,13 @@ public class TestSome extends BaseAssert {
         assertEquals(TEXT_VALUE.length(), mapped.get().intValue());
     }
 
+    @Test(expected = BrokenFunctionException.class)
+    public void flatMap_fail() {
+        option.flatMap(v -> {
+            throw new Exception("Oh darn, this went FUBAR!");
+        });
+    }
+
     @Test
     public void isEmpty() {
         assertFalse(option.isEmpty());
#<I> added test cases for Option.map/flatMap with failing functions