=== modified file 'mandos'
--- mandos	2013-10-26 19:05:21 +0000
+++ mandos	2013-10-28 20:08:32 +0000
@@ -690,10 +690,11 @@
         # If a checker exists, make sure it is not a zombie
         try:
             pid, status = os.waitpid(self.checker.pid, os.WNOHANG)
-        except (AttributeError, OSError) as error:
-            if (isinstance(error, OSError)
-                and error.errno != errno.ECHILD):
-                raise error
+        except AttributeError:
+            pass
+        except OSError as error:
+            if error.errno != errno.ECHILD:
+                raise
         else:
             if pid:
                 logger.warning("Checker was a zombie")
@@ -1702,7 +1703,7 @@
             logger.debug("Protocol version: %r", line)
             try:
                 if int(line.strip().split()[0]) > 1:
-                    raise RuntimeError
+                    raise RuntimeError(line)
             except (ValueError, IndexError, RuntimeError) as error:
                 logger.error("Unknown protocol version: %s", error)
                 return
@@ -1915,7 +1916,7 @@
     
     def add_pipe(self, parent_pipe, proc):
         """Dummy function; override as necessary"""
-        raise NotImplementedError
+        raise NotImplementedError()
 
 
 class IPv6_TCPServer(MultiprocessingMixInWithPipe,
@@ -2258,7 +2259,7 @@
             else:
                 raise ValueError("Unknown suffix {0!r}"
                                  .format(suffix))
-        except (ValueError, IndexError) as e:
+        except IndexError as e:
             raise ValueError(*(e.args))
         timevalue += delta
     return timevalue
@@ -2481,7 +2482,7 @@
         os.setuid(uid)
     except OSError as error:
         if error.errno != errno.EPERM:
-            raise error
+            raise
     
     if debug:
         # Enable all possible GnuTLS debugging
@@ -2792,7 +2793,7 @@
             else:
                 logger.warning("Could not save persistent state:",
                                exc_info=e)
-                raise e
+                raise
         
         # Delete all clients, and settings from config
         while tcp_server.clients: