Merge "Move ParseException to Connectivity"