Merge pull request #5425 from lhchavez/fix-get-delta-base pack: Improve error handling for get_delta_base()