Small changes to handle Remote Exceptions better