added some checks to we don't convert or analyze if we don't need to