Changed API error messages, reworked error behavior