removed catching null pointers