Cleaned up the handling of XMLRPC errors
Merge branch 'master' into sl_model