update error handling

* turns out we cant throw RemoteExceptions

Change-Id: Ib31a77c09d3f4480af2d185ab1d56f68edcee576