Catch nulls early

Useful while I continue to fail with dagger