Merge "Avoid crashing on unknown package in pregrants exceptions"