Changed, now it is called only as an else clause.
Regarding the break, I see your point but then for consistency it should be in all error conditions. I will leave it like this since it does not break the flow unneeded.