ALM-650 better error handling for canonical URLs