Handle untagged events more gracefully