GH620: second diff from rt-2275, adds error code