some extra null pointer checks