fixes #335 - enhanced cancel threshold check to also make sure unit has a threshold