diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp
index 55232cefc..49f81af61 100644
--- a/hphp/compiler/analysis/emitter.cpp
+++ b/hphp/compiler/analysis/emitter.cpp
@@ -1686,6 +1686,9 @@ void EmitterVisitor::visit(FileScopePtr file) {
                 if (func->isSimpleDefine(&name, &tv)) {
                   UnitMergeKind k = func->isDefineWithoutImpl(ar) ?
                     UnitMergeKindPersistentDefine : UnitMergeKindDefine;
+                  if (tv.m_type == KindOfUninit) {
+                    tv.m_type = KindOfNull;
+                  }
                   m_ue.pushMergeableDef(k, name, tv);
                   visit(s);
                   continue;
diff --git a/hphp/runtime/vm/unit.cpp b/hphp/runtime/vm/unit.cpp
index edf4ccfda..1c6edefd1 100644
--- a/hphp/runtime/vm/unit.cpp
+++ b/hphp/runtime/vm/unit.cpp
@@ -1273,6 +1273,7 @@ void Unit::mergeImpl(void* tcbase, UnitMergeInfo* mi) {
           Stats::inc(Stats::UnitMerge_mergeable_define);
           StringData* name = (StringData*)((char*)obj - (int)k);
           auto* v = (TypedValueAux*)mi->mergeableData(ix + 1);
+          assert(v->m_type != KindOfUninit);
           mergeCns(getDataRef<TypedValue>(tcbase, v->cacheHandle()), v, name);
           ix += 1 + sizeof(*v) / sizeof(void*);
           obj = mi->mergeableObj(ix);
diff --git a/hphp/test/quick/null_constant.php b/hphp/test/quick/null_constant.php
new file mode 100644
index 000000000..3805438ea
--- /dev/null
+++ b/hphp/test/quick/null_constant.php
@@ -0,0 +1,2 @@
+<?php
+define('FOO', null);
diff --git a/hphp/test/quick/null_constant.php.expect b/hphp/test/quick/null_constant.php.expect
new file mode 100644
index 000000000..e69de29bb