CB-6940: Exceptions being thrown should be looking for NullPointerException