Fix crash right way.

I saw your recent activity to fix it. Here is solution :yum: