diff --git a/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c b/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c
index c5ac449..9806c0a 100644
--- a/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c
+++ b/cmd/log_mgmt/port/mynewt/src/mynewt_log_mgmt.c
@@ -47,6 +47,33 @@
     }
 }
 
+static int
+log_mgmt_mynewt_err_map(int mynewt_os_err)
+{
+    switch (mynewt_os_err) {
+        case OS_ENOENT:
+            /* no break */
+        case SYS_ENOENT:
+            return LOG_MGMT_ERR_ENOENT;
+        case OS_ENOMEM:
+            /* no break */
+        case SYS_ENOMEM:
+            return LOG_MGMT_ERR_ENOMEM;
+        case OS_OK:
+            return LOG_MGMT_ERR_EOK;
+        case OS_EINVAL:
+            /* no break */
+        case OS_INVALID_PARM:
+            /* no break */
+        case SYS_EINVAL:
+            return LOG_MGMT_ERR_EINVAL;
+        case SYS_ENOTSUP:
+            return LOG_MGMT_ERR_ENOTSUP;
+        default:
+            return LOG_MGMT_ERR_EUNKNOWN;
+    }
+}
+
 int
 log_mgmt_impl_set_watermark(struct log_mgmt_log *log, int index)
 {
@@ -55,7 +82,7 @@
 
     tmplog = mynewt_log_mgmt_find_log(log->name);
     if (tmplog) {
-        return log_set_watermark(tmplog, index);
+        return log_mgmt_mynewt_err_map(log_set_watermark(tmplog, index));
     } else {
         return LOG_MGMT_ERR_ENOENT;
     }