Fix comparison between nulls - Thx Francois Botha