diff --git a/reactos/subsys/system/explorer/doc/TODO.txt b/reactos/subsys/system/explorer/doc/TODO.txt
index 2c3452cf651..3dbafff6367 100644
--- a/reactos/subsys/system/explorer/doc/TODO.txt
+++ b/reactos/subsys/system/explorer/doc/TODO.txt
@@ -1,3 +1,4 @@
+- rewrite autostart code and include all possible autostart locations
 - read "DESCRIPT.ION" files to display file descriptions
 - context menus for quick launch bar
 - detect display mode changes and adjust desktop bar size
diff --git a/reactos/subsys/system/explorer/shell/shellbrowser.cpp b/reactos/subsys/system/explorer/shell/shellbrowser.cpp
index f436b40e06e..d2e966798c8 100644
--- a/reactos/subsys/system/explorer/shell/shellbrowser.cpp
+++ b/reactos/subsys/system/explorer/shell/shellbrowser.cpp
@@ -536,7 +536,7 @@ String ShellBrowserChild::jump_to_int(LPCTSTR url)
 		if (jump_to_pidl(ShellPath(dir)))
 			return FmtString(TEXT("file://%s"), (LPCTSTR)dir);
 	}
-
+	
 	return String();
 }
 
@@ -564,7 +564,8 @@ bool ShellBrowserChild::jump_to_pidl(LPCITEMIDLIST pidl)
 		Entry* found = entry->find_entry(p);
 		p = entry->get_next_path_component(p);
 
-		hitem = select_entry(hitem, found);
+		if (found)
+			hitem = select_entry(hitem, found);
 
 		entry = found;
 	}
diff --git a/reactos/subsys/system/explorer/taskbar/traynotify.cpp b/reactos/subsys/system/explorer/taskbar/traynotify.cpp
index 9c3bfb38bd5..effe294b9d2 100644
--- a/reactos/subsys/system/explorer/taskbar/traynotify.cpp
+++ b/reactos/subsys/system/explorer/taskbar/traynotify.cpp
@@ -1172,9 +1172,11 @@ int ClockWindow::Notify(int id, NMHDR* pnmh)
 		TCHAR buffer[64];
 
 		GetLocalTime(&systime);
-		GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &systime, NULL, buffer, 64);
 
-		_tcscpy(pdi->szText, buffer);
+		if (GetDateFormat(LOCALE_USER_DEFAULT, DATE_LONGDATE, &systime, NULL, buffer, 64))
+			_tcscpy(pdi->szText, buffer);
+		else
+			pdi->szText[0] = '\0';
 	}
 
 	return 0;