Done #14

Enhanced API error messages (english please! :)) and taking them into
account