4 files changed, 16 insertions, 8 deletions
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
index 084de4fb1..8e7293f0b 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.2_T1.js
@@ -18,8 +18,10 @@ for (indexB1 = 0x00; indexB1 <= 0x7F; indexB1++) {
   var index = indexB1;  
   try {
     hex = String.fromCharCode(index);
-    if (decodeURIComponent("%" + hexB1.substring(2)) === hex) continue;
-  } catch (e) {}   
+    if (decodeURIComponent("%" + hexB1.substring(2)) === hex) continue;
+  } catch (e) {
+    if (e instanceof Test262Error) throw e;
+  }   
   if (indexO === 0) { 
     indexO = index;
   } else {
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
index 578f3b136..b42a9eab6 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.3_T1.js
@@ -20,8 +20,10 @@ for (indexB1 = 0xC2; indexB1 <= 0xDF; indexB1++) {
     var hexB2 = decimalToHexString(indexB2);
     var index = (indexB1 & 0x1F) * 0x40 + (indexB2 & 0x3F);  
     try {
-      if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;
-    } catch (e) {}   
+      if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2)) === String.fromCharCode(index)) continue;
+    } catch (e) {
+      if (e instanceof Test262Error) throw e;
+    }   
     if (indexO === 0) { 
       indexO = index;
     } else {
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
index 9721ccf4d..6ca3dcf74 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.4_T1.js
@@ -24,8 +24,10 @@ for (indexB1 = 0xE0; indexB1 <= 0xEF; indexB1++) {
       var hexB3 = decimalToHexString(indexB3);
       var index = (indexB1 & 0x0F) * 0x1000 + (indexB2 & 0x3F) * 0x40 + (indexB3 & 0x3F);  
       try {
-        if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;        
-      } catch (e) {}   
+        if (decodeURIComponent("%" + hexB1.substring(2) + "%" + hexB2.substring(2) + "%" + hexB3.substring(2)) === String.fromCharCode(index)) continue;
+      } catch (e) {
+        if (e instanceof Test262Error) throw e;
+      }
       if (indexO === 0) { 
         indexO = index;
       } else {
diff --git a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
index fcb428fc0..49f4a6c81 100644
--- a/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
+++ b/test/suite/ch15/15.1/15.1.3/15.1.3.2/S15.1.3.2_A2.5_T1.js
@@ -28,8 +28,10 @@ for (indexB1 = 0xF0; indexB1 <= 0xF4; indexB1++) {
         var L = ((index - 0x10000) & 0x03FF) + 0xDC00;
         var H = (((index - 0x10000) >> 10) & 0x03FF) + 0xD800;  
         try {
-          if (decodeURIComponent("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;        
-        } catch (e) {}   
+          if (decodeURIComponent("%" + hexB1.substring(3) + "%" + hexB2.substring(3) + "%" + hexB3.substring(3) + "%" + hexB4.substring(3)) === String.fromCharCode(H) + String.fromCharCode(L)) continue;
+        } catch (e) {
+          if (e instanceof Test262Error) throw e;
+        }   
         if (indexO === 0) { 
           indexO = index;
         } else {