diff --git a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
index c697f6c37613c256ab69b5949bb4570e87925710..988e6687a5e61989ef24a718392773f522e73863 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/SleuthkitCase.java
@@ -9739,10 +9739,12 @@ public TagName addOrUpdateTagName(String displayName, String description, TagNam
 
 			long tagId = resultSet.getLong(1);
 
+			resultSet.close();
 			statement = connection.getPreparedStatement(PREPARED_STATEMENT.SELECT_TAG_NAME_BY_ID);
 			statement.clearParameters();
 			statement.setLong(1, tagId);
 			resultSet = connection.executeQuery(statement);
+			resultSet.next();
 
 			return new TagName(tagId,
 					displayName, description, color, knownStatus, resultSet.getLong("tag_set_id"), resultSet.getInt("rank"));