Fix nullPointers