diff --git a/amxmodx/modules.cpp b/amxmodx/modules.cpp
index ebe8c3b8..422be5d2 100755
--- a/amxmodx/modules.cpp
+++ b/amxmodx/modules.cpp
@@ -997,6 +997,7 @@ int loadModules(const char* filename, PLUG_LOADTIME now)
 
 	while (!feof(fp))
 	{
+		buffer[0] = '\0';
 		fgets(buffer, sizeof(buffer)-1, fp);
 
 		if (buffer[0] == ';' || buffer[0] == '\n')
diff --git a/amxmodx/newmenus.cpp b/amxmodx/newmenus.cpp
index 6faf1dbf..c31f775a 100755
--- a/amxmodx/newmenus.cpp
+++ b/amxmodx/newmenus.cpp
@@ -151,7 +151,7 @@ int Menu::PagekeyToItem(page_t page, item_t key)
 
 	if (num_pages == 1 || !items_per_page)
 	{
-		if (m_AlwaysExit && key > m_Items.size())
+		if (m_AlwaysExit || key >= m_Items.size())
 			return MENU_EXIT;
 		else
 			return key-1;