diff --git a/veejay-current/veejay-server/veejay/vj-eventman.c b/veejay-current/veejay-server/veejay/vj-eventman.c
index b7078bd9..10e5de8f 100644
--- a/veejay-current/veejay-server/veejay/vj-eventman.c
+++ b/veejay-current/veejay-server/veejay/vj-eventman.c
@@ -351,12 +351,12 @@ void		vj_event_vevo_dump(void)
 void		vj_event_vevo_free(void)
 {
 	unsigned int i;
-
-	for( i = 0 ; i < MAX_INDEX  ; i ++ )
-	  if( index_map_[i] ) vpf( index_map_[i] ); 
-	
-	free(index_map_);
-}
+	if( index_map_ ) {
+		for( i = 0 ; i < MAX_INDEX  ; i ++ )
+		  if( index_map_[i] ) vpf( index_map_[i] ); 
+			free(index_map_);
+	}
+}	
 
 void		vj_init_vevo_events(void)
 {