crashfix: fixes Whoooa crash
The very last'est invalid-iterator fix
Merge PR #2644 - Whoooa! Fix the crash!