Added error checking for failed port mapping
Added test for failed remove port mapping