Should be an exception rather than a WARN
Fix a nasty bug. Shouldn't remove internal events