diff --git a/frontend-js/src/main/js/plugin/Plugin.js b/frontend-js/src/main/js/plugin/Plugin.js
index f8ee085afceccb72344a0d85c97b30a7ca29f559..f97b46111d0580a73d385520458d57d71826f00d 100644
--- a/frontend-js/src/main/js/plugin/Plugin.js
+++ b/frontend-js/src/main/js/plugin/Plugin.js
@@ -135,10 +135,16 @@ Plugin.prototype.unload = function () {
 };
 
 Plugin.prototype.getName = function () {
+  if (this.getLoadedPluginData() === undefined) {
+    return "";
+  }
   return this.getLoadedPluginData().getName();
 };
 
 Plugin.prototype.getVersion = function () {
+  if (this.getLoadedPluginData() === undefined) {
+    return "";
+  }
   return this.getLoadedPluginData().getVersion();
 };
 
diff --git a/frontend-js/src/test/js/plugin/Plugin-test.js b/frontend-js/src/test/js/plugin/Plugin-test.js
index 13a83633b15ccd537479eb7a0636360ace8aa5fd..e2bcfd6091844ea9058a1c87300ddfba888c382b 100644
--- a/frontend-js/src/test/js/plugin/Plugin-test.js
+++ b/frontend-js/src/test/js/plugin/Plugin-test.js
@@ -62,7 +62,7 @@ describe('Plugin', function () {
       return plugin.load().then(function () {
         assert.notOk("expected error");
       }, function (error) {
-        assert.ok(error.message.indexOf("Unexpected identifier") >= 0);
+        assert.ok(error.message.indexOf("Unexpected identifier") >= 0, "Wrong message: " + error.message);
       });
     });
 
@@ -75,7 +75,7 @@ describe('Plugin', function () {
       return plugin.load().then(function () {
         assert.false("expected error");
       }, function (error) {
-        assert.ok(error.message.indexOf("Let's crash") >= 0);
+        assert.ok(error.message.indexOf("Let's crash") >= 0, "Wrong message: " + error.message);
       });
     });
     it('plugin register promise reject', function () {
@@ -86,8 +86,8 @@ describe('Plugin', function () {
       });
       return plugin.load().then(function () {
         assert.false("expected error");
-      }, function (error) {
-        assert.ok(error.message.indexOf("Let's reject") >= 0);
+      }).catch( function (error) {
+        assert.ok(error.message.indexOf("Let's reject") >= 0, "Wrong message: " + error.message);
       });
     });
   });
diff --git a/frontend-js/testFiles/apiCalls/plugins/POST_hash=273dffdc94ef22531b90fb4489ba00c3&name=plugin%20with%20promise&url=.%2FtestFiles%2Fplugin-invalid%2Fresult-promise-crash.js&version=0.0.1&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/plugins/POST_hash=273dffdc94ef22531b90fb4489ba00c3&name=plugin%20with%20promise&url=.%2FtestFiles%2Fplugin-invalid%2Fresult-promise-crash.js&version=0.0.1&token=MOCK_TOKEN_ID&
new file mode 100644
index 0000000000000000000000000000000000000000..ef54c7024105eb463b067f5c07a8f5366a32c192
--- /dev/null
+++ b/frontend-js/testFiles/apiCalls/plugins/POST_hash=273dffdc94ef22531b90fb4489ba00c3&name=plugin%20with%20promise&url=.%2FtestFiles%2Fplugin-invalid%2Fresult-promise-crash.js&version=0.0.1&token=MOCK_TOKEN_ID&
@@ -0,0 +1,8 @@
+{
+    "hash": "273dffdc94ef22531b90fb4489ba00c3",
+    "name": "plugin with promise",
+    "urls": [
+        "./testFiles/plugin-invalid/result-promise-crash.js"
+    ],
+    "version": "0.0.1"
+}
\ No newline at end of file
diff --git a/frontend-js/testFiles/apiCalls/plugins/POST_hash=c36d817fb1e6c3a7b569ee9ba55baa76&url=.%2FtestFiles%2Fplugin-invalid%2Finvalid_javascript.js&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/plugins/POST_hash=c36d817fb1e6c3a7b569ee9ba55baa76&url=.%2FtestFiles%2Fplugin-invalid%2Finvalid_javascript.js&token=MOCK_TOKEN_ID&
new file mode 100644
index 0000000000000000000000000000000000000000..d761df0e384bed73c00e94c215aa85d5b904d15e
--- /dev/null
+++ b/frontend-js/testFiles/apiCalls/plugins/POST_hash=c36d817fb1e6c3a7b569ee9ba55baa76&url=.%2FtestFiles%2Fplugin-invalid%2Finvalid_javascript.js&token=MOCK_TOKEN_ID&
@@ -0,0 +1,8 @@
+{
+    "hash": "c36d817fb1e6c3a7b569ee9ba55baa76",
+    "name": "",
+    "urls": [
+        "./testFiles/plugin-invalid/invalid_javascript.js"
+    ],
+    "version": ""
+}
\ No newline at end of file
diff --git a/frontend-js/testFiles/apiCalls/plugins/POST_hash=d5d652ac0e0f6467d4cb6a742f99d3f7&name=test%20plugin&url=.%2FtestFiles%2Fplugin-invalid%2Finvalid_register.js&version=0.0.1&token=MOCK_TOKEN_ID& b/frontend-js/testFiles/apiCalls/plugins/POST_hash=d5d652ac0e0f6467d4cb6a742f99d3f7&name=test%20plugin&url=.%2FtestFiles%2Fplugin-invalid%2Finvalid_register.js&version=0.0.1&token=MOCK_TOKEN_ID&
new file mode 100644
index 0000000000000000000000000000000000000000..02a0838194fc09c68eaaced9fc942eea364ac0ba
--- /dev/null
+++ b/frontend-js/testFiles/apiCalls/plugins/POST_hash=d5d652ac0e0f6467d4cb6a742f99d3f7&name=test%20plugin&url=.%2FtestFiles%2Fplugin-invalid%2Finvalid_register.js&version=0.0.1&token=MOCK_TOKEN_ID&
@@ -0,0 +1,8 @@
+{
+    "hash": "d5d652ac0e0f6467d4cb6a742f99d3f7",
+    "name": "test plugin",
+    "urls": [
+        "./testFiles/plugin-invalid/invalid_register.js"
+    ],
+    "version": "0.0.1"
+}
\ No newline at end of file