1 files changed, 5 insertions, 2 deletions
diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index dbc52a02a..89254a2a5 100644
--- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -818,9 +818,12 @@ class PWsdrCache {
                  **/
                 return false;
             }
-        } catch (Exception e) {
-            return false;
+        } catch (IOException e) {
+            throw e;
+        } catch (InterruptedException e) {
+            Thread.currentThread().interrupt();
         }
+        return false;
     }
 
     public void debug(String msg) {