diff --git a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventTypes.java b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventTypes.java
index 258bab58fc83c03c6207ebe4029ecbca0e5d802f..1fb7cd76292126b94ace0eb621e79f904a04ded4 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/TimelineEventTypes.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/TimelineEventTypes.java
@@ -27,7 +27,6 @@
 import static org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE.TSK_GEO_TRACKPOINTS;
 import org.sleuthkit.datamodel.blackboardutils.attributes.TskGeoTrackpointsUtil;
 import org.sleuthkit.datamodel.blackboardutils.attributes.TskGeoTrackpointsUtil.GeoTrackPointList;
-import org.sleuthkit.datamodel.blackboardutils.attributes.TskGeoTrackpointsUtil.GeoTrackPointList.GeoTrackPoint;
 
 /**
  * Container class for various types of timeline events
diff --git a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/GeoArtifactsHelper.java b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/GeoArtifactsHelper.java
index 9bb29bd10d6a9d2fba199e9c72200348972c465a..0e3f99f5a072d33678e470d91dfb72af8b68e6fe 100755
--- a/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/GeoArtifactsHelper.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/blackboardutils/GeoArtifactsHelper.java
@@ -75,7 +75,7 @@ public GeoArtifactsHelper(SleuthkitCase caseDb, String moduleName, String progra
 	public BlackboardArtifact addTrack(String trackName, GeoTrackPointList points, List<BlackboardAttribute> moreAttributes) throws TskCoreException, BlackboardException {
 		
 		if(points == null) {
-			throw new IllegalArgumentException(String.format("GeoTrackPointList is required to be non-null"));
+			throw new IllegalArgumentException(String.format("addTrack was passed a null list of track points"));
 		}
 		
 		BlackboardArtifact artifact = getContent().newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_TRACK);
@@ -118,7 +118,7 @@ public BlackboardArtifact addTrack(String trackName, GeoTrackPointList points, L
 	public BlackboardArtifact addRoute(String routeName, Long creationTime, GeoWaypointList points, List<BlackboardAttribute> moreAttributes) throws TskCoreException, BlackboardException {
 
 		if (points == null) {
-			throw new IllegalArgumentException(String.format("GeoWaypointList object be valid"));
+			throw new IllegalArgumentException(String.format("addRoute was passed a null list of waypoints"));
 		}
 
 		BlackboardArtifact artifact = getContent().newArtifact(BlackboardArtifact.ARTIFACT_TYPE.TSK_GPS_ROUTE);