pgw: Improve checks around Gy messages

Change-Id: Ica3ca4cf72113d66e74dcff9f838e39cc5d63468
3 files changed