diff --git a/BaseCommon/Daemon.cpp b/BaseCommon/Daemon.cpp
index aa34ed7..4c4b193 100644
--- a/BaseCommon/Daemon.cpp
+++ b/BaseCommon/Daemon.cpp
@@ -169,7 +169,11 @@ DAEMONIZE_RESULT CDaemon::daemonise(const std::string& pidFile, const std::strin
         char str[256];
 		sprintf(str, "%d\n", getpid());
 		/* Write PID to lockfile */
-		write(m_pid_fd, str, strlen(str));
+		ssize_t writeCount = write(m_pid_fd, str, strlen(str));
+		if(writeCount < 0) {
+			CLog::logFatal("Failed to write to PID File. Err: %d", errno);
+			return DR_FAILURE;
+		}
 	}
 
     return DR_CHILD;
diff --git a/README.md b/README.md
index 1581021..573e5c3 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,7 @@ The testing framwework used is Google Test.
 # 5. Version History
 ## 5.1. Version 1.0
 - [**Bugfix**] Fix #37 Unable to transmit multiple files (DGWVoiceTransmit) ([#37](https://github.com/F4FXL/DStarGateway/issues/37))
+- [**Bugfix**] Fix #36 Error1 Build fails in some environment ([#37](https://github.com/F4FXL/DStarGateway/issues/36))
 ## 5.2. Version 0.7
 - [**Bugfix**] Unknow repeater entries in log when using Icom Hardware ([#34](https://github.com/F4FXL/DStarGateway/issues/34))
 - [**Bugfix**] Malformed callsign in some cases when using DV-G (NMEA) ([#33](https://github.com/F4FXL/DStarGateway/issues/33))