diff --git a/am/piam.c b/am/piam.c
index c3c68bd..d1438ab 100644
--- a/am/piam.c
+++ b/am/piam.c
@@ -32,7 +32,9 @@ typedef struct {
 	RfSample.Frequency=Frequency;
 	RfSample.WaitForThisSample=Timing; //en 100 de nanosecond
 	//printf("Freq =%f Timing=%d\n",RfSample.Frequency,RfSample.WaitForThisSample);
-	write(FileFreqTiming,&RfSample,sizeof(samplerf_t));
+	if (write(FileFreqTiming,&RfSample,sizeof(samplerf_t)) != sizeof(samplerf_t)) {
+		fprintf(stderr, "Unable to write sample\n");
+	}
 
 }
 
diff --git a/dcf77/pidcf77.c b/dcf77/pidcf77.c
index 74bcb23..1abec8b 100644
--- a/dcf77/pidcf77.c
+++ b/dcf77/pidcf77.c
@@ -237,7 +237,9 @@ void playtone(double Amplitude,uint32_t Timing)
 	RfSample.Amplitude=Amplitude;
 	RfSample.WaitForThisSample=Timing; //en 100 de nanosecond
 	printf("%f %ld\n",Amplitude,Timing);
-	write(FileFreqTiming,&RfSample,sizeof(samplerf_t));
+	if (write(FileFreqTiming,&RfSample,sizeof(samplerf_t)) != sizeof(samplerf_t)) {
+		fprintf(stderr, "Unable to write sample\n");
+	}
 
 }
 
diff --git a/fm/pifm.c b/fm/pifm.c
index 4e54808..3dacb63 100644
--- a/fm/pifm.c
+++ b/fm/pifm.c
@@ -32,7 +32,9 @@ typedef struct {
 	RfSample.Frequency=Frequency;
 	RfSample.WaitForThisSample=Timing; //en 100 de nanosecond
 	//printf("Freq =%f Timing=%d\n",RfSample.Frequency,RfSample.WaitForThisSample);
-	write(FileFreqTiming,&RfSample,sizeof(samplerf_t));
+	if (write(FileFreqTiming,&RfSample,sizeof(samplerf_t)) != sizeof(samplerf_t)) {
+		fprintf(stderr, "Unable to write sample\n");
+	}
 
 }
 
diff --git a/fsq/pifsq.c b/fsq/pifsq.c
index d1f7568..e084160 100644
--- a/fsq/pifsq.c
+++ b/fsq/pifsq.c
@@ -216,7 +216,9 @@ typedef struct {
 	RfSample.Frequency=Frequency;
 	RfSample.WaitForThisSample=Timing*1000L; //en 100 de nanosecond
 	//printf("Freq =%f Timing=%d\n",RfSample.Frequency,RfSample.WaitForThisSample);
-	write(FileFreqTiming,&RfSample,sizeof(samplerf_t));
+	if (write(FileFreqTiming,&RfSample,sizeof(samplerf_t)) != sizeof(samplerf_t)) {
+		fprintf(stderr, "Unable to write sample\n");
+	}
 
 }
 
diff --git a/src/RpiDma.c b/src/RpiDma.c
index ca85fd5..6d02621 100644
--- a/src/RpiDma.c
+++ b/src/RpiDma.c
@@ -6,8 +6,12 @@
 char InitDma(void *FunctionTerminate)
 {
 	DMA_CHANNEL=4;
-	system("rm linuxversion.txt");
-	system("uname -r >> linuxversion.txt");
+	if (system("rm -f linuxversion.txt") != 0) {
+		fprintf(stderr, "rm failed\n");
+	}
+	if (system("uname -r >> linuxversion.txt") != 0) {
+		fprintf(stderr, "uname failed\n");
+	}
 	char *line = NULL;
 	size_t size;
 //	int fLinux=open("Flinuxversion.txt", "r');
diff --git a/src/RpiTx.c b/src/RpiTx.c
index 4bd3444..02453da 100644
--- a/src/RpiTx.c
+++ b/src/RpiTx.c
@@ -81,6 +81,8 @@ Optimize CPU on PWMFrequency
 #define PLLFREQ_192             19200000	//PLLA = 19.2MHZ
 #define PLL_192			0x1
 
+#define HEADER_SIZE 44
+
 
 typedef unsigned char 	uchar ;		// 8 bit
 typedef unsigned short	uint16 ;	// 16 bit
@@ -1116,8 +1118,10 @@ main(int argc, char **argv)
 	if(Mode==MODE_IQ)
 	{
 		IQArray=malloc(DmaSampleBurstSize*2*sizeof(signed short)); // TODO A FREE AT THE END OF SOFTWARE
-		char dummyheader[44];
-		read(FileInHandle,dummyheader,44);
+		char dummyheader[HEADER_SIZE];
+		if (read(FileInHandle,dummyheader,HEADER_SIZE) != HEADER_SIZE) {
+			fatal("Unable to read header\n");
+		}
 		
 	} 
 	if(Mode==MODE_IQ_FLOAT)
@@ -1298,8 +1302,10 @@ for (;;)
 							printf("Looping FileIn\n");
 							close(FileInHandle);
 							FileInHandle = open(FileName, O_RDONLY);
-							char dummyheader[44];
-							read(FileInHandle,dummyheader,44);
+							char dummyheader[HEADER_SIZE];
+							if (read(FileInHandle,dummyheader,HEADER_SIZE) != HEADER_SIZE) {
+								fatal("Unable to read header\n");
+							}
 							NbRead=read(FileInHandle,IQArray,DmaSampleBurstSize*2*2);
 						}
 						else
diff --git a/sstv/pisstv.c b/sstv/pisstv.c
index e6526b3..c10d763 100644
--- a/sstv/pisstv.c
+++ b/sstv/pisstv.c
@@ -31,7 +31,9 @@ void playtone(double Frequency,uint32_t Timing)
 	RfSample.Frequency=GlobalTuningFrequency+Frequency;
 	RfSample.WaitForThisSample=Timing*100L; //en 100 de nanosecond
 	//printf("Freq =%f Timing=%d\n",RfSample.Frequency,RfSample.WaitForThisSample);
-	write(FileFreqTiming,&RfSample,sizeof(samplerf_t));
+	if (write(FileFreqTiming,&RfSample,sizeof(samplerf_t)) != sizeof(samplerf_t)) {
+		fprintf(stderr, "Unable to write sample");
+	}
 
 }