diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
index 91cb59b0f..bc937cb8e 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/AbstractFileTrackImporter.java
@@ -378,7 +378,7 @@ abstract class AbstractFileTrackImporter extends DefaultHandler implements Track
 
         Uri photoUri = FileUtils.getUriForFile(context, file);
 
-        return photoUri.toString();
+        return "" + photoUri;
     }
 
     /**
diff --git a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java
index f03b7fe97..792b0a994 100644
--- a/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java
+++ b/src/main/java/de/dennisguse/opentracks/io/file/importer/KmlFileTrackImporter.java
@@ -186,7 +186,7 @@ public class KmlFileTrackImporter extends AbstractFileTrackImporter {
             return;
         }
 
-        // If there is photoUrl it has to be changed because that url in kml file isn't a valid content:// to the imported one.
+        // If there is photoUrl it has to be changed because that url in kml file is a relative path to the internal kmz file.
         if (photoUrl != null) {
             photoUrl = getPhotoUrl(Uri.parse(photoUrl).getLastPathSegment());
         }