bugid 6193557253652480
Merge pull request #397 from timrae/6193557253652480

Prevent crash on bug 6193557253652480