Fix event handler on server interupt