Comment 10 for bug 1191820

Now that the desktop and phablet branch are consolidated, this bug is fixed on the phablet as well. I went through some other parts of the code that had the same issue, but didn't lead to a crash yet (see revision 369).