Merge "Change to use checked exceptions in rAPP Catalogue"