Fixed stopping crash in some cases

2012-02-23, Edouard Tisserant