         @_logger.debug 'Completed Command', commandName
         resolve result
       .catch (error) =>
+        paramsWithHiddenPasswordValue = @_hidePasswordValue params
         commandErrorMessage = """
-          Command "#{commandName}" with arguments #{JSON.stringify(params)} of context "#{@name}" rejects with an error
+          Command "#{commandName}" with arguments #{JSON.stringify(paramsWithHiddenPasswordValue)} of context "#{@name}"
+          rejects with an error
         """
 
         if not error

        @_logger.debug "Completed Query #{queryName} with Result #{result}"
        resolve result
      .catch (error) =>
        queryErrorMessage = """
          Query "#{queryName}" with arguments #{JSON.stringify(params)} of context "#{@name}" rejects with an error
        """

        if not error

    @_addPendingPromise executingCommand

    return executingCommand


  _hidePasswordValue: (params) ->
    if params.password
      params.password = '******'
    return params


  _getCommandServicesToInject: ->
