Could this be changed to HEIRLOOM_INT_BP && !HEIRLOOM_INT_BP.empty?