[MERGE] merged branch to handle the new exceptions with netrpc (was done for xmlrpc...