changed exception back to NullPointer