Stopped depending on messy null pointer catch for an error.