Cleared some "Possible Null-Pointer Dereferencing"-warnings