diff --git a/source/Applewin.cpp b/source/Applewin.cpp
index 7b838218..aaebeec2 100644
--- a/source/Applewin.cpp
+++ b/source/Applewin.cpp
@@ -550,7 +550,7 @@ void SetCurrentImageDir(const char* pszImageDir)
 	strcpy(g_sCurrentDir, pszImageDir);
 
 	int nLen = strlen( g_sCurrentDir );
-	if( g_sCurrentDir[ nLen - 1 ] != '\\' )
+	if ((nLen > 0) && (g_sCurrentDir[ nLen - 1 ] != '\\'))
 	{
 		g_sCurrentDir[ nLen + 0 ] = '\\';
 		g_sCurrentDir[ nLen + 1 ] = 0;
diff --git a/source/DiskImageHelper.cpp b/source/DiskImageHelper.cpp
index 4eeef4a8..fc3ad069 100644
--- a/source/DiskImageHelper.cpp
+++ b/source/DiskImageHelper.cpp
@@ -436,7 +436,7 @@ void CImageBase::DenibblizeTrack(LPBYTE trackimage, SectorOrder_e SectorOrder, i
 				offset = 0;
 		}
 
-		if ((bytenum == 3) && (byteval[1] = 0xAA))
+		if ((bytenum == 3) && (byteval[1] == 0xAA))
 		{
 			int loop       = 0;
 			int tempoffset = offset;