Improved Error Handling when talking with Surabaya
Merge branch 'origin/develop'