Added some RemoteException handling