Fix G4 crash

Merged Johannes Junggeburth requested to merge jojungge/athena:ATLASSIM-6573 into master

Closes ATLASSIM-6573

Merge request reports