Fix/crash

Closed Simon Morlat requested to merge fix/crash into master

Merge request reports