diff --git a/history.c b/history.c
index 49e51b106..daf1a18f8 100644
--- a/history.c
+++ b/history.c
@@ -202,6 +202,10 @@ static void history_to_hash()
 {
 	history_data *d;
 	
+	if( !history_last )
+		return;
+	
+
 	d = (history_data *)hash_get( &history_table, 
 								  mode_name );
 	
diff --git a/main.c b/main.c
index 47355208e..d24263085 100644
--- a/main.c
+++ b/main.c
@@ -61,6 +61,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "output.h"
 #include "translate.h"
 #include "halloc_util.h"
+#include "history.h"
 
 
 /**