Proper null checks