diff --git a/pluginHandler.js b/pluginHandler.js
index e324cb21..89193ffd 100644
--- a/pluginHandler.js
+++ b/pluginHandler.js
@@ -412,12 +412,16 @@ module.exports.pluginHandler = function (parent) {
} else {
parent.db.updatePlugin(id, { status: 1, version: version_only.name }, func);
}
- obj.plugins[plugin.shortName] = require(obj.pluginPath + '/' + plugin.shortName + '/' + plugin.shortName + '.js')[plugin.shortName](obj);
- obj.exports[plugin.shortName] = obj.plugins[plugin.shortName].exports;
- if (typeof obj.plugins[plugin.shortName].server_startup == 'function') obj.plugins[plugin.shortName].server_startup();
- var plugin_config = obj.fs.readFileSync(obj.pluginPath + '/' + plugin.shortName + '/config.json');
- plugin_config = JSON.parse(plugin_config);
- parent.db.updatePlugin(plugin._id, plugin_config);
+ try {
+ obj.plugins[plugin.shortName] = require(obj.pluginPath + '/' + plugin.shortName + '/' + plugin.shortName + '.js')[plugin.shortName](obj);
+ obj.exports[plugin.shortName] = obj.plugins[plugin.shortName].exports;
+ if (typeof obj.plugins[plugin.shortName].server_startup == 'function') obj.plugins[plugin.shortName].server_startup();
+ } catch (e) { console.log('Error instantiating new plugin: ', e); }
+ try {
+ var plugin_config = obj.fs.readFileSync(obj.pluginPath + '/' + plugin.shortName + '/config.json');
+ plugin_config = JSON.parse(plugin_config);
+ parent.db.updatePlugin(plugin._id, plugin_config);
+ } catch (e) { console.log('Error reading plugin config upon install'); }
parent.updateMeshCore();
});
});
diff --git a/views/default.handlebars b/views/default.handlebars
index 13374a72..9e2cd7e7 100644
--- a/views/default.handlebars
+++ b/views/default.handlebars
@@ -9539,7 +9539,7 @@
installedPluginList.forEach(function(p){
var cant_action = [];
if (p.hasAdminPanel == true && p.status) {
- p.nameHtml = '' + p.name + '';
+ p.nameHtml = '' + p.name + '';
} else {
p.nameHtml = p.name;
}