Use object check instead of null

Use object check instead of null #1488