Index: ammosreader/AbstractAmmosReader.py
===================================================================
--- ammosreader/AbstractAmmosReader.py	(revision 008dcb7cd6fac15421c533918960563bdb68fd7b)
+++ ammosreader/AbstractAmmosReader.py	(revision 0c6fd4c78a1b6615509a20caf0afcd77519bec9d)
@@ -20,5 +20,5 @@
 
         :param source: The source to read Ammos data from
-        :type source: AmmosSource 
+        :type source: AmmosSource
         """
         self.__source = source
@@ -92,5 +92,5 @@
         """My descendents have to implement this."""
         return self.__source.read_bytes(bytes_to_read)
-    
+
     @abstractmethod
     def read_next_global_frame_body(self, data_header_length):
@@ -106,7 +106,4 @@
         """
         global_frame_header = self.read_next_global_frame_header()
-
-        if global_frame_header is None:
-            return None
 
         if global_frame_header is None:
@@ -136,4 +133,5 @@
             global_frame_body = self.read_next_global_frame_body(global_frame_header.data_header_length)
             if global_frame_body is None:
+                logger.info("Can not read global frame body for audio data stream")
                 return None
             return AmmosSingleFrame(global_frame_header, global_frame_body)
@@ -143,8 +141,10 @@
             global_frame_body = self.read_next_global_frame_body(global_frame_header.data_header_length)
             if global_frame_body is None:
+                logger.info("Can not read global frame body for IF data stream")
                 return None
             return AmmosSingleFrame(global_frame_header, global_frame_body)
 
         if global_frame_body is None:
+            logger.info("Can not read global frame body")
             return None
 
Index: ammosreader/AmmosSocketSource.py
===================================================================
--- ammosreader/AmmosSocketSource.py	(revision 008dcb7cd6fac15421c533918960563bdb68fd7b)
+++ ammosreader/AmmosSocketSource.py	(revision 0c6fd4c78a1b6615509a20caf0afcd77519bec9d)
@@ -1,7 +1,12 @@
+"""I provide a source to read AMMOS data from a socket."""
+
 import socket
 
 from ammosreader.AmmosSource import AmmosSource
+from ammosreader import logger
+
 
 class AmmosSocketSource(AmmosSource):
+    """I implement a descendent of AmmosSource that reads from a socket."""
 
     def read_bytes(self, bytes_to_read):
@@ -18,5 +23,5 @@
                 logger.info("Got %s bytes of %s remaining", len(new_bytes), bytes_to_read - len(b''.join(byte_array)))
                 byte_array.append(new_bytes)
-        except: TimeOutError:
+        except TimeoutError:
             return None
         return b''.join(byte_array)