Fix null

This one should fix #1870.