Updated NullMaker

Hopefully this fixes build issues