diff --git a/datatop/src/datatop_gen_poll.c b/datatop/src/datatop_gen_poll.c
index 457cc35..c3eb09d 100644
--- a/datatop/src/datatop_gen_poll.c
+++ b/datatop/src/datatop_gen_poll.c
@@ -69,6 +69,10 @@
 	read = dt_read_file(dpg->file, &data, DTOP_GEN_SIZE);
 	line_len = dt_read_line(line, DTOP_GEN_LINE, data, DTOP_GEN_SIZE, 0);
 
+	if (read == 0) {
+		return 0;
+	}
+
 	if (line_len < 1) {
 		dt_free(&data);
 		return 0;
diff --git a/datatop/src/datatop_stat_poll.c b/datatop/src/datatop_stat_poll.c
index 3eadaeb..88320b5 100644
--- a/datatop/src/datatop_stat_poll.c
+++ b/datatop/src/datatop_stat_poll.c
@@ -219,7 +219,7 @@
  */
 int dtop_stat_search(struct dtop_stat_vars *storage)
 {
-	int i, k, n, sum;
+	int i, n, sum;
 	char *data;
 	int *line_len = malloc(sizeof(int) * storage->line_count);
 	int read;
@@ -297,7 +297,6 @@
 			count++;
 		}
 	}
-	k = 0;
 
 	/* Calls dpg constructor, dpg will point to the dp struct */
 	construct_stat_file_dpg(data_points, storage, dp_count);