From c877d9c7f801a0849ef1da348a06921508a60a29 Mon Sep 17 00:00:00 2001
From: Exodus4D <exodus4d@gmail.com>
Date: Sat, 22 Jul 2017 10:14:55 +0200
Subject: [PATCH] Merge branch 'master' into develop

---
 public/js/v1.2.4/app/map/map.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/public/js/v1.2.4/app/map/map.js b/public/js/v1.2.4/app/map/map.js
index 0e455843..687dfba3 100644
--- a/public/js/v1.2.4/app/map/map.js
+++ b/public/js/v1.2.4/app/map/map.js
@@ -408,7 +408,9 @@ define([
                     }
 
                     // update tooltip placement based on system position
-                    system.data('bs.tooltip').options.placement = getSystemTooltipPlacement(system);
+                    if (system.data('bs.tooltip')) {
+                        system.data('bs.tooltip').options.placement = getSystemTooltipPlacement(system);
+                    }
 
                     // show() can be forced
                     if(options.show === true){