diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch
new file mode 100644
index 000000000..fd5d39bbd
--- /dev/null
+++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager/0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch
@@ -0,0 +1,25 @@
+From: Mike Engel <Mike.Engel@digi.com>
+Date: Wed, 15 Mar 2017 18:01:06 +0100
+Subject: [PATCH] meta-digi-dey: Add fix to return correct error code.
+
+Signed-off-by: Mike Engel <Mike.Engel@digi.com>
+---
+ .../meta-digi-dey/recipes-connectivity/modemmanager/mm-broadband-modem-qmi.c       | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
+index bc13925..f60d0f4 100644
+--- a/src/mm-broadband-modem-qmi.c
++++ b/src/mm-broadband-modem-qmi.c
+@@ -1740,7 +1740,10 @@ dms_uim_get_pin_status_ready (QmiClientDms *client,
+         /* We get InvalidQmiCommand on newer devices which don't like the legacy way */
+         if (g_error_matches (error,
+                              QMI_PROTOCOL_ERROR,
+-                             QMI_PROTOCOL_ERROR_INVALID_QMI_COMMAND)) {
++                             QMI_PROTOCOL_ERROR_INVALID_QMI_COMMAND) ||
++            g_error_matches (error,
++                             QMI_PROTOCOL_ERROR,
++                             QMI_PROTOCOL_ERROR_NOT_SUPPORTED)) {
+             g_error_free (error);
+             qmi_message_dms_uim_get_pin_status_output_unref (output);
+             /* Flag that the command is unsupported, and try with the new way */
\ No newline at end of file
diff --git a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
index c490ec1bb..58f94be2e 100644
--- a/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
+++ b/meta-digi-dey/recipes-connectivity/modemmanager/modemmanager_%.bbappend
@@ -2,7 +2,10 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${BPN}:"
 
-SRC_URI += "file://cellularifupdown"
+SRC_URI += " \
+	file://cellularifupdown \
+	file://0001-meta-digi-dey-Add-fix-to-return-correct-error-code.patch \
+"
 
 # 'polkit' depends on 'consolekit', and this requires 'x11' distro feature. So
 # remove 'polkit' support to be able to build ModemManager on a framebuffer