Merge "Fix crash on bug report"