Timob 12651 Standardize erroring, Android edition.

Tests still missing, but need sanity checks.