--- a/jdk/test/java/util/Locale/LocaleEnhanceTest.java	Tue Nov 24 19:02:33 2015 +0300
+++ b/jdk/test/java/util/Locale/LocaleEnhanceTest.java	Tue Nov 24 14:46:09 2015 +0530
@@ -1180,8 +1180,11 @@
             dataDir = new File(dataDirName);
         }
 
-        if (dataDir == null || !dataDir.isDirectory()) {
-            errln("Could not locate the serialized test case data location");
+        if (dataDir == null) {
+            errln("'dataDir' is null. serialized.data.dir Property value is "+dataDirName);
+            return;
+        } else if (!dataDir.isDirectory()) {
+            errln("'dataDir' is not a directory. dataDir: "+dataDir.toString());
             return;
         }