Merge "Handle null package argument"