diff --git a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java
index e63210c51a2..7a5e7bcc3e5 100644
--- a/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java
+++ b/core/org.eclipse.cdt.core.tests/parser/org/eclipse/cdt/internal/pdom/tests/DBPropertiesTests.java
@@ -88,17 +88,23 @@ public class DBPropertiesTests extends BaseTestCase {
 		try {
 			ps.setProperty(null, "val1");
 			fail("NullPointerException expected");
-		} catch(NullPointerException e) {}
+		} catch(NullPointerException e) {
+		} catch(AssertionError e) {
+		}
 		
 		try {
 			ps.setProperty("key", null);
 			fail("NullPointerException expected");
-		} catch(NullPointerException e) {}
+		} catch(NullPointerException e) {
+		} catch(AssertionError e) {
+		}
 
 		try {
 			ps.setProperty(null, null);
 			fail("NullPointerException expected");
-		} catch(NullPointerException e) {}
+		} catch(NullPointerException e) {
+		} catch(AssertionError e) {
+		}
 		
 		assertFalse(ps.removeProperty(null));