Added check for correct event type args