Pass through exceptions and minor refactoring
SDKJAVA-3 Functional Android client (API Level 10) with latest Java client