Index: /trunk/FACT++/src/drivectrl.cc
===================================================================
--- /trunk/FACT++/src/drivectrl.cc	(revision 13164)
+++ /trunk/FACT++/src/drivectrl.cc	(revision 13165)
@@ -879,4 +879,15 @@
     int Track(const EventImp &evt)
     {
+        if (evt.GetSize()<=17)
+        {
+            ostringstream msg;
+            msg << "Track - Received event has " << evt.GetSize() << " bytes, but expected at least 17.";
+            T::Fatal(msg);
+            return false;
+        }
+
+        if (evt.Get<char>(evt.GetSize()-1)!='\0')
+            T::Warn("Track - It seems that the string is not zero-terminated.");
+
         const double *dat = evt.Ptr<double>();
         const string name = evt.Ptr<char>(16);
@@ -886,6 +897,6 @@
             return T::Error("Source '"+name+"' not found in list.");
 
-        const double &ra   = it->second.first;
-        const double &dec  = it->second.second;
+        const double &ra  = it->second.first;
+        const double &dec = it->second.second;
 
         return StartWobble(ra, dec, dat[0], dat[1], name);