Merge "Early exit if we don't have a package on record"