SCOUT-99 Put the fault handling code before the unmarshalling code in RegistryImpl so that if both a fault and an unmarshalling error occurs, we get the base fault.