Added 2 more error codes and messages