Removed yet another hard-coded testing hack. This code must never have been used in anger! Also improved handling of error handling after SOAP call.