diff --git a/libraries/stdlib/src/kotlin/Maps.kt b/libraries/stdlib/src/kotlin/Maps.kt
index 3e610d84e78..0f51a8c77ab 100644
--- a/libraries/stdlib/src/kotlin/Maps.kt
+++ b/libraries/stdlib/src/kotlin/Maps.kt
@@ -34,7 +34,7 @@ val <K,V> Map.Entry<K,V>.value : V
  *
  * @includeFunctionBody ../../test/MapTest.kt getOrElse
  */
-public inline fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V) : V {
+public inline fun <K,V> Map<K,V>.getOrElse(key: K, defaultValue: ()-> V?) : V? {
     val current = this.get(key)
     if (current != null) {
         return current
diff --git a/libraries/stdlib/test/CollectionTest.kt b/libraries/stdlib/test/CollectionTest.kt
index 9c1c3e66ddf..08e7bdd4a03 100644
--- a/libraries/stdlib/test/CollectionTest.kt
+++ b/libraries/stdlib/test/CollectionTest.kt
@@ -184,7 +184,7 @@ class CollectionTest {
         assertEquals(4, byLength.size())
 
         val l3 = byLength.getOrElse(3, {ArrayList<String>()})
-        assertEquals(2, l3.size)
+        assertEquals(2, l3?.size)
     }
 
     test fun makeString() {