Change methods to return nil when not returning a specific value