Fixed warnings for too many statements

We broke down save’s client error rescue into two short methods