GUI-554
fixed a couple of refs to old error handling