correct error handling#3182

shubham1g5 merged 3 commits intocommcare_2.57dimagi/commcare-android:commcare_2.57from

errorHandlingFixesdimagi/commcare-android:errorHandlingFixesCopy head branch name to clipboard