#952 - add more error logging in cases where the Gateway implementation is wrong