Merge "Fail with helpful message if RPM not found"