Fixed bug with follow ups that caused a crash. Not sure if it is an OS
specific bug. Testing is needed on a Windows machine (test the Oreo
event).