X-Git-Url: http://nitlanguage.org

diff --git a/src/semantize/typing.nit b/src/semantize/typing.nit
index b37e4a4..4868fc9 100644
--- a/src/semantize/typing.nit
+++ b/src/semantize/typing.nit
@@ -1304,7 +1304,8 @@ redef class AOrElseExpr
 		end
 
 		if t1 isa MNullType then
-			v.error(n_expr, "Type Error: `or else` on `null`.")
+			self.mtype = t2
+			return
 		else if v.check_can_be_null(n_expr, t1) then
 			t1 = t1.as_notnull
 		end
@@ -1688,14 +1689,8 @@ redef class ABinopExpr
 	redef fun property_name do return operator
 	redef fun property_node do return n_op
 end
-redef class AEqExpr
-	redef fun accept_typing(v)
-	do
-		super
-		v.null_test(self)
-	end
-end
-redef class ANeExpr
+
+redef class AEqFormExpr
 	redef fun accept_typing(v)
 	do
 		super