Merge "Catch only the exceptions thrown by SubnetUtils"