diff --git a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
index 3b04c30d94..39eb023cb3 100644
--- a/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
+++ b/app/src/main/java/info/nightscout/androidaps/Services/DataService.java
@@ -37,6 +37,7 @@ import info.nightscout.androidaps.plugins.SourceNSClient.SourceNSClientPlugin;
 import info.nightscout.androidaps.plugins.SourceXdrip.SourceXdripPlugin;
 import info.nightscout.androidaps.receivers.DataReceiver;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSDeviceStatus;
+import info.nightscout.utils.BundleLogger;
 import info.nightscout.utils.SP;
 
 
@@ -56,7 +57,7 @@ public class DataService extends IntentService {
     @Override
     protected void onHandleIntent(final Intent intent) {
         if (Config.logFunctionCalls)
-            log.debug("onHandleIntent " + intent);
+            log.debug("onHandleIntent " + BundleLogger.log(intent.getExtras()));
 
         if (ConfigBuilderPlugin.getActiveBgSource().getClass().equals(SourceXdripPlugin.class)) {
             xDripEnabled = true;
diff --git a/app/src/main/java/info/nightscout/utils/BundleLogger.java b/app/src/main/java/info/nightscout/utils/BundleLogger.java
new file mode 100644
index 0000000000..ba6ffff869
--- /dev/null
+++ b/app/src/main/java/info/nightscout/utils/BundleLogger.java
@@ -0,0 +1,21 @@
+package info.nightscout.utils;
+
+import android.os.Bundle;
+
+/**
+ * Created by mike on 14.08.2017.
+ */
+
+public class BundleLogger {
+    public static String log(Bundle bundle) {
+        if (bundle == null) {
+            return null;
+        }
+        String string = "Bundle{";
+        for (String key : bundle.keySet()) {
+            string += " " + key + " => " + bundle.get(key) + ";";
+        }
+        string += " }Bundle";
+        return string;
+    }
+}