Fixed error message
Added check for cf value