643f315 Backport MR #206 to fix #485 (crash triggered in various ways)

Authored and Committed by adamwill 3 years ago
    Backport MR #206 to fix #485 (crash triggered in various ways)
    
        
file modified
+9 -1