Handle error to return @NO

Thanks, @jspahrsummers!
Group the client categories in umbrella header