diff --git a/CLI/CLI.c b/CLI/CLI.c
index 5233b57..52eb0a2 100644
--- a/CLI/CLI.c
+++ b/CLI/CLI.c
@@ -147,7 +147,6 @@ void historyNext(CLI_t* cli)
 	// write line
 	if ((ret >= 0) && (line != NULL))
 	{
-		int i;
 		CLI_stringOut(cli, line);
 	}
 }
diff --git a/History/History.c b/History/History.c
index bc52e05..21f742e 100644
--- a/History/History.c
+++ b/History/History.c
@@ -123,7 +123,7 @@ int History_getPrev(History_t* history, char** line)
 		*line = NULL;
 		retCode = -1;
 	}
-	return 0;
+	return retCode;
 }
 
 int History_getNext(History_t* history, char** line)
@@ -144,7 +144,7 @@ int History_getNext(History_t* history, char** line)
 		*line = NULL;
 		retCode = -1;
 	}
-	return 0;
+	return retCode;
 }
 
 int History_getFullHistory(History_t* history, char*** list)