Collection RPC fixes, error handler fixes