Added RPC exceptions and router comments