More error checking for events