NULL not merged to the em anymore.
Merge pull request #890 from ngodfraind/bugfixes

NULL not merged to the em anymore.