Segfaultfix

Merged Audrey Hamelers requested to merge segfaultfix into master

Merge request reports