Fix return value on conditional to not return nil