Improved Error Handling when talking with Surabaya