Merge pull request #1046 from laanwj/2012_04_rpcporterror