Fix GDR code to avoid invalid reference

CHECK statements added where invalid reference was detected. Some variable names fixed.