diff --git a/src/cli/microservice.js b/src/cli/microservice.js
index 31d7a2fe5..ab21361f3 100644
--- a/src/cli/microservice.js
+++ b/src/cli/microservice.js
@@ -359,8 +359,7 @@ const _createVolumeMapping = async function (obj, user) {
 
 const _removePortMapping = async function (obj, user) {
   try {
-    const internalPort = parseInt(obj.internalPort);
-    await MicroserviceService.deletePortMapping(obj.microserviceUuid, internalPort, user, true);
+    await MicroserviceService.deletePortMapping(obj.microserviceUuid, obj.internalPort, user, true);
     logger.info('Port mapping has been removed successfully.');
   } catch (e) {
     logger.error(e.message);
diff --git a/src/helpers/error-messages.js b/src/helpers/error-messages.js
index ad05bc3c1..9caebc8df 100644
--- a/src/helpers/error-messages.js
+++ b/src/helpers/error-messages.js
@@ -58,6 +58,7 @@ module.exports = {
   RESTRICTED_PUBLISHER: "You are not allowed to add catalog item as 'Eclipse ioFog' publisher",
   REQUIRED_FOG_NODE: 'ioFog node is required.',
   PORT_MAPPING_ALREADY_EXISTS: 'Port mapping already exists',
+  PORT_MAPPING_INTERNAL_PORT_NOT_PROVIDED: 'Internal port wasn\'t provided',
   VOLUME_MAPPING_ALREADY_EXISTS: 'Volume mapping already exists',
   INVALID_CONNECTOR_DOMAIN: 'Invalid connector domain {}',
   CERT_PROPERTY_REQUIRED: 'Property "certificate" is required if property "requiresCert" is set to true',
diff --git a/src/services/connector-port-service.js b/src/services/connector-port-service.js
index bf309344f..235adf59e 100644
--- a/src/services/connector-port-service.js
+++ b/src/services/connector-port-service.js
@@ -89,7 +89,6 @@ async function closePortOnConnector(connector, ports) {
   let data = qs.stringify({
     mappingid: ports.mappingId
   });
-  console.log(data);
 
   let port = connector.devMode ? constants.CONNECTOR_HTTP_PORT : constants.CONNECTOR_HTTPS_PORT;
 
@@ -115,7 +114,6 @@ async function closePortOnConnector(connector, ports) {
 async function _makeRequest(connector, options, data) {
   return new Promise((resolve, reject) => {
     let httpreq = (connector.devMode ? http : https).request(options, function (response) {
-      console.log(response.statusCode);
       let output = '';
       response.setEncoding('utf8');
 
@@ -134,7 +132,6 @@ async function _makeRequest(connector, options, data) {
     });
 
     httpreq.on('error', function (err) {
-      console.log(err);
       if (err instanceof Error)
         return reject(new Error(err.message));
       else
diff --git a/src/services/microservices-service.js b/src/services/microservices-service.js
index df3f712fd..15f1e5bdf 100644
--- a/src/services/microservices-service.js
+++ b/src/services/microservices-service.js
@@ -366,6 +366,9 @@ async function deletePortMapping(microserviceUuid, internalPort, user, isCLI, tr
     ? {uuid: microserviceUuid}
     : {uuid: microserviceUuid, userId: user.id};
 
+  if (!internalPort) {
+    throw new Errors.ValidationError(ErrorMessages.PORT_MAPPING_INTERNAL_PORT_NOT_PROVIDED);
+  }
   const microservice = await MicroserviceManager.findOne(where, transaction);
   if (!microservice) {
     throw new Errors.NotFoundError(AppHelper.formatMessage(ErrorMessages.INVALID_MICROSERVICE_UUID, microserviceUuid))