Null checks, starting on loading. #23