Dunno how this code got deleted...
Null fixes