SD-46 better soap error handling
SD-48
SD-48 + cleanup
SD-48