diff --git a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreClearBasket.java b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreClearBasket.java
index a080adfa8bd..8f751264264 100644
--- a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreClearBasket.java
+++ b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreClearBasket.java
@@ -39,10 +39,8 @@ private MemorystoreClearBasket() {
      */
     public static void main(final String[] args) {
         // Connect to the Memorystore instance
-        JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
-
-        try (Jedis jedis = pool.getResource()) {
-            String basketKey = "basket:" + USER_ID;
+        try (JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
+                Jedis jedis = pool.getResource()) {
 
             // Delete the basket (remove all items)
             long deleted = jedis.del(basketKey);
diff --git a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLoginUser.java b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLoginUser.java
index 03cbbf4b64b..7f7090704dd 100644
--- a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLoginUser.java
+++ b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLoginUser.java
@@ -44,9 +44,8 @@ private MemorystoreLoginUser() {
      */
     public static void main(final String[] args) {
         // Connect to the Memorystore instance
-        JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
-
-        try (Jedis jedis = pool.getResource()) {
+        try (JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
+                Jedis jedis = pool.getResource()) {
 
             // Generate a session token
             String sessionToken = UUID.randomUUID().toString();
diff --git a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLogoutUser.java b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLogoutUser.java
index 94f7136451f..62cdd51b527 100644
--- a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLogoutUser.java
+++ b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreLogoutUser.java
@@ -42,14 +42,16 @@ public static void main(final String[] args) {
         try (JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
                 Jedis jedis = pool.getResource()) {
 
-            // Check if the session exists
-            if (!jedis.exists(TOKEN)) {
+            // Remove the session from Redis
+            Long totalRemoved = jedis.del(TOKEN);
+
+            // When no session is found to remove,
+            // that means the user is not logged in
+            if (totalRemoved == 0) {
                 System.out.printf("User %s is not logged in.%n", TOKEN);
                 return;
             }
 
-            // Remove the session from Redis
-            jedis.del(TOKEN);
             System.out.printf("User %s has been logged out.%n", TOKEN);
         } catch (Exception e) {
             System.err.printf("Error connecting to Redis: %s%n", e.getMessage());
diff --git a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreRemoveItemFromBasket.java b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreRemoveItemFromBasket.java
index 881713c5b60..d2f46f8cf34 100644
--- a/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreRemoveItemFromBasket.java
+++ b/memorystore/valkey/session/snippets/src/main/java/samples/MemorystoreRemoveItemFromBasket.java
@@ -45,9 +45,9 @@ private MemorystoreRemoveItemFromBasket() {
      */
     public static void main(final String[] args) {
         // Connect to the Memorystore instance
-        JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
+        try (JedisPool pool = new JedisPool(INSTANCE_ID, PORT);
+                Jedis jedis = pool.getResource()) {
 
-        try (Jedis jedis = pool.getResource()) {
             String basketKey = "basket:" + USER_ID;
 
             // Remove the item from the user's basket
@@ -59,7 +59,14 @@ public static void main(final String[] args) {
             // Remove the item if the quanitity is less than or equal to 0
             if (newQty <= 0) {
                 // Remove the item from the basket
-                jedis.hdel(basketKey, ITEM_ID);
+                Long totalRemoved = jedis.hdel(basketKey, ITEM_ID);
+
+                // When no item is found to remove,
+                // that means the item is not in the basket
+                if (totalRemoved == 0) {
+                    System.out.printf("Item %s not found in basket: %s%n", ITEM_ID, USER_ID);
+                    return;
+                }
 
                 // print the item removed
                 System.out.printf("Removed item from basket: %s%n", ITEM_ID);