diff -wruN -x '*~' -x '*.o' -x '*.a' -x '*.so' -x '*.so.[0-9]' -x autom4te.cache -x .deps -x .libs ../orig-openhpi-3.6.0/openhpid/openhpid-posix.cpp ./openhpid/openhpid-posix.cpp
--- ../orig-openhpi-3.6.0/openhpid/openhpid-posix.cpp	2015-08-27 02:34:59.000000000 +0200
+++ ./openhpid/openhpid-posix.cpp	2015-09-07 13:50:10.880957904 +0200
@@ -432,6 +432,7 @@
     INFO("Socket timeout(sec): %d.", sock_timeout);
 
     if (oh_init()) { // Initialize OpenHPI
+	unlink(pidfile);
         CRIT("There was an error initializing OpenHPI. Exiting.");
         return 8;
     }