Add additional check around other dispatch blocks