Code

2nd attempt at fixing the crash introduced in rev. #9692. This should nail it!