diff --git a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/service/ScriptingLayerService.java b/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/service/ScriptingLayerService.java
index 9d5b4cf..154c3e5 100644
--- a/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/service/ScriptingLayerService.java
+++ b/ScriptingLayerForAndroid/src/com/googlecode/android_scripting/service/ScriptingLayerService.java
@@ -261,6 +261,8 @@
     }
 
     private ScriptProcess launchScript(Intent intent, AndroidProxy proxy) {
+        Log.d(String.format("Launching script with intent: %s.",
+                intent.toUri(0)));
         final int port = proxy.getAddress().getPort();
         File script = new File(intent.getStringExtra(Constants.EXTRA_SCRIPT_PATH));
         return ScriptLauncher.launchScript(script, mInterpreterConfiguration, proxy, () -> {
@@ -276,6 +278,8 @@
     }
 
     private InterpreterProcess launchInterpreter(Intent intent, AndroidProxy proxy) {
+        Log.d(String.format("Launching interpreter with intent: %s.",
+                intent.toUri(0)));
         InterpreterConfiguration config =
                 ((BaseApplication) getApplication()).getInterpreterConfiguration();
         final int port = proxy.getAddress().getPort();
