Merge "Add null check for retrieved package." into rvc-dev