Was never able to get it to crash originally, but this doesn't seem to break anything as far as I can tell, so
merged
mentioned in commit 6528b4a0