More null checks. Fixes #1 I swear