deal better with remoteStorage clients, better error handling