NullException Refactored