Updated a case where a Null value is returned when it shouldn't be.