Index: /trunk/BNC/RTCM/RTCM2.cpp
===================================================================
--- /trunk/BNC/RTCM/RTCM2.cpp	(revision 246)
+++ /trunk/BNC/RTCM/RTCM2.cpp	(revision 247)
@@ -277,6 +277,4 @@
 void ThirtyBitWord::getHeader(string& buf) {
 
-  if (buf.length() == 0) return;
-
   unsigned int W_old = W;
   unsigned int i;
@@ -285,5 +283,5 @@
   while (!isHeader() || i<5 ) {
     // Check if string is long enough; if not restore old word and exit
-    if (buf.size()-1<i) {
+    if (buf.size() == 0 || buf.size()-1<i) {
       W = W_old;
       failure = true;