CB-6940: Android: cleanup try/catch exception handling