diff --git a/core/org.osate.xtext.aadl2.ui/src/org/osate/xtext/aadl2/ui/propertyview/CachePropertyLookupJob.xtend b/core/org.osate.xtext.aadl2.ui/src/org/osate/xtext/aadl2/ui/propertyview/CachePropertyLookupJob.xtend
index 1e8b6038967..ffc8d9adaf6 100644
--- a/core/org.osate.xtext.aadl2.ui/src/org/osate/xtext/aadl2/ui/propertyview/CachePropertyLookupJob.xtend
+++ b/core/org.osate.xtext.aadl2.ui/src/org/osate/xtext/aadl2/ui/propertyview/CachePropertyLookupJob.xtend
@@ -106,7 +106,7 @@ package class CachePropertyLookupJob extends Job {
 					].entrySet.map[key.URI -> value]).unmodifiableView
 				}
 			]
-		} catch (NullPointerException e) {
+		} catch (RuntimeException e) {
 		}
 		if (monitor.canceled) {
 			Status.CANCEL_STATUS