MOBILE-579 - Handle exceptions
MOBILE-579 - Regenerate