BUGFIX: fixes #947. Only fixes crash, not a root cause, which stays unknown.