Minor code cleanup
A bit to much clean-up; reversed
Soap fault reported properly