SOAP-525 Added more padding + better error handling in fix