Merge "Catch correct exception for adding route fail"