Fix crash.
This is the first half of a solution for bug #164320 and only fixes the crash while they are still remaining layout-problems.

Well, since we have tagging tomorrow, let's at least get this one in for beta2.