made template less exception-happy
Merge branch 'feature/ivw-szm-agof-tracking' into develop