diff --git a/Foundation/src/DirectoryIterator_WIN32.cpp b/Foundation/src/DirectoryIterator_WIN32.cpp
index a12978a2b..3ee31884b 100644
--- a/Foundation/src/DirectoryIterator_WIN32.cpp
+++ b/Foundation/src/DirectoryIterator_WIN32.cpp
@@ -1,7 +1,7 @@
 //
 // DirectoryIterator_WIN32.cpp
 //
-// $Id: //poco/Main/Foundation/src/DirectoryIterator_WIN32.cpp#12 $
+// $Id: //poco/Main/Foundation/src/DirectoryIterator_WIN32.cpp#13 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -55,9 +55,12 @@ DirectoryIteratorImpl::DirectoryIteratorImpl(const std::string& path): _fh(INVAL
 		if (GetLastError() != ERROR_NO_MORE_FILES)
 			File::handleLastError(path);
 	}
-	_current = _fd.cFileName;
-	if (_current == "." || _current == "..")	
-		next();
+	else
+	{
+		_current = _fd.cFileName;
+		if (_current == "." || _current == "..")	
+			next();
+	}
 }
 
 
diff --git a/Foundation/src/DirectoryIterator_WIN32U.cpp b/Foundation/src/DirectoryIterator_WIN32U.cpp
index 7903f5f4b..a0fa6fa42 100644
--- a/Foundation/src/DirectoryIterator_WIN32U.cpp
+++ b/Foundation/src/DirectoryIterator_WIN32U.cpp
@@ -1,7 +1,7 @@
 //
 // DirectoryIterator_WIN32U.cpp
 //
-// $Id: //poco/Main/Foundation/src/DirectoryIterator_WIN32U.cpp#6 $
+// $Id: //poco/Main/Foundation/src/DirectoryIterator_WIN32U.cpp#7 $
 //
 // Library: Foundation
 // Package: Filesystem
@@ -59,9 +59,12 @@ DirectoryIteratorImpl::DirectoryIteratorImpl(const std::string& path): _fh(INVAL
 		if (GetLastError() != ERROR_NO_MORE_FILES)
 			File::handleLastError(path);
 	}
-	UnicodeConverter::toUTF8(_fd.cFileName, _current);
-	if (_current == "." || _current == "..")	
-		next();
+	else
+	{
+		UnicodeConverter::toUTF8(_fd.cFileName, _current);
+		if (_current == "." || _current == "..")	
+			next();
+	}
 }