Index: modules/tools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java =================================================================== --- modules/tools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java (revision 451900) +++ modules/tools/src/main/java/org/apache/harmony/tools/toolutils/KeyStoreLoaderSaver.java (working copy) @@ -76,8 +76,13 @@ ksFile = new File(uri); } catch (URISyntaxException e) { ksFile = new File(path); + } catch (IllegalArgumentException e){ + ksFile = new File(path); } + if (!ksFile.exists()) { + throw new IOException("Keystore file does not exist"); + } if (ksFile.length() == 0) { throw new IOException("Keystore file exists but is empty"); }