More null-checks for stability's sake