Remove oc_port redundancy & reformat error messages