Fix for disabled null support
Markup test and fixes