Fix the whole null business