Fixed: prevent error when creating new event