Option asserts that its argument is not null.

1 files changed, 3 insertions, 0 deletions

diff --git a/src/library/scala/Option.scala b/src/library/scala/Option.scala
index b24b575216..2d07a05944 100644
--- a/src/library/scala/Option.scala
+++ b/src/library/scala/Option.scala
@@ -131,10 +131,13 @@ sealed abstract class Option[+A] extends Product {
 /** Class <code>Some[A]</code> represents existing values of type
  *  <code>A</code>.
  *
+ *  The argument may not be null.
+ *
  *  @author  Martin Odersky
  *  @version 1.0, 16/07/2003
  */
 final case class Some[+A](x: A) extends Option[A] {
+  assert (x != null)
   def isEmpty = false
   def get = x
 }