Code

Patch by Diederik to mitigate crash on 318726.