diff --git a/src/dos/drive_fat.cpp b/src/dos/drive_fat.cpp
index ce411649..58f3059e 100644
--- a/src/dos/drive_fat.cpp
+++ b/src/dos/drive_fat.cpp
@@ -1,5 +1,5 @@
 /*
- *  Copyright (C) 2002-2007  The DOSBox Team
+ *  Copyright (C) 2002-20078  The DOSBox Team
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -16,7 +16,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
-/* $Id: drive_fat.cpp,v 1.23 2007-11-03 17:20:29 c2woody Exp $ */
+/* $Id: drive_fat.cpp,v 1.24 2008-02-22 18:18:03 c2woody Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -394,6 +394,7 @@ bool fatDrive::getEntryName(char *fullname, char *entname) {
 
 	//LOG_MSG("Testing for filename %s", fullname);
 	findDir = strtok(dirtoken,"\\");
+	if (findDir==NULL) return false;
 	findFile = findDir;
 	while(findDir != NULL) {
 		findFile = findDir;