Fixed crash + improved logs

Closed Sylvain Berfini requested to merge fix/crash into master

Merge request reports