Added extra check for warning