Added null checks for callbacks in BundleLoader (#9648)

2 files changed, 10 insertions, 4 deletions

diff --git a/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java b/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java
index 7bbd93c6e3..2073ab7aab 100644
--- a/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java
+++ b/client/src/com/vaadin/client/metadata/AsyncBundleLoader.java
@@ -53,13 +53,15 @@ public abstract class AsyncBundleLoader {
     public void load(BundleLoadCallback callback, TypeDataStore store) {
         assert state == State.NOT_STARTED;
         state = State.LOADING;
-        callbacks.add(callback);
+        addCallback(callback);
         load(store);
     }
 
     public void addCallback(BundleLoadCallback callback) {
         assert state == State.LOADING;
-        callbacks.add(callback);
+        if (callback != null) {
+            callbacks.add(callback);
+        }
     }
 
     public List<BundleLoadCallback> setLoaded() {
diff --git a/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java b/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
index 7d6c209ebf..0549547e38 100644
--- a/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
+++ b/client/src/com/vaadin/client/metadata/ConnectorBundleLoader.java
@@ -47,10 +47,14 @@ public abstract class ConnectorBundleLoader {
             loader.addCallback(callback);
             break;
         case LOADED:
-            callback.loaded();
+            if (callback != null) {
+                callback.loaded();
+            }
             break;
         case ERROR:
-            callback.failed(loader.getError());
+            if (callback != null) {
+                callback.failed(loader.getError());
+            }
         }
     }