Fix crash reported in freeze-break branch BUG 707937

Fix for issue 186