Updated class for null exceptions