ADDED: more error codes and error handling