Added Controller and reporter checking.