--- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java	2022-08-23 17:20:57.270678000 +0200
+++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/event/RemoveImagesEventHandler.java	2022-08-23 11:08:04.861290000 +0200
@@ -128,14 +128,15 @@
   }
 
   public void onUpdate(@Observes EntityUpdateEvent event) {
-    if (!isValidEvent(event)) {
+    Entity entity = event.getTargetInstance().getEntity();
+    if (!isValidEvent(event) || !entity.hasProperty("organization")) {
       return;
     }
 
-    Property orgProperty = event.getTargetInstance().getEntity().getProperty("organization");
+    Property orgProperty = entity.getProperty("organization");
 
     // Iterate image properties of the entity
-    for (String property : getImageProperties(event.getTargetInstance().getEntity())) {
+    for (String property : getImageProperties(entity)) {
 
       Property imageProperty = event.getTargetInstance().getEntity().getProperty(property);
       Image bob = (Image) event.getPreviousState(imageProperty);