Merge "Catch correct exception for adding route fail" am: c2050ac731

Change-Id: Ic3c94ed56bf31b404bf0836e676a13f1e47edd3b