diff --git a/oscar64/NativeCodeGenerator.cpp b/oscar64/NativeCodeGenerator.cpp
index c6db593..c25977f 100644
--- a/oscar64/NativeCodeGenerator.cpp
+++ b/oscar64/NativeCodeGenerator.cpp
@@ -33490,7 +33490,7 @@ bool NativeCodeBasicBlock::MoveLoadLogicStoreAbsUp(int at)
 
 		if (mIns[j].ChangesZeroPage(mIns[at + 0].mAddress))
 			return false;
-		if (mIns[at + 1].mType == ASMIM_ZERO_PAGE && mIns[j].ChangesZeroPage(mIns[at + 1].mAddress))
+		if (mIns[at + 1].mMode == ASMIM_ZERO_PAGE && mIns[j].ChangesZeroPage(mIns[at + 1].mAddress))
 			return false;
 
 		if (mIns[j].UsesMemoryOf(mIns[at + 2]))
diff --git a/oscar64/Scanner.cpp b/oscar64/Scanner.cpp
index 6ce2d3f..a7fe446 100644
--- a/oscar64/Scanner.cpp
+++ b/oscar64/Scanner.cpp
@@ -143,6 +143,8 @@ const char* TokenNames[] =
 	"'#endif'",
 	"'#ifdef'",
 	"'#ifndef'",
+	"'#error'",
+	"'#warning'",
 	"'#pragma'",
 	"'#line'",
 
@@ -769,6 +771,33 @@ void Scanner::NextPreToken(void)
 					mOffset++;
 			}
 		}
+		else if (mToken == TK_PREP_ERROR)
+		{
+			NextRawToken();
+
+			if (mToken == TK_STRING)
+			{
+				mErrors->Error(mLocation, ERRR_PREPROCESSOR, (const char*)mTokenString);
+			}
+			else
+			{
+				mErrors->Error(mLocation, EERR_INVALID_PREPROCESSOR, "Missing or invalid error message");
+			}
+			exit(EXIT_FAILURE);
+		}
+		else if (mToken == TK_PREP_WARN)
+		{
+			NextRawToken();
+
+			if (mToken == TK_STRING)
+			{
+				this->Warning((const char*)mTokenString);
+			}
+			else
+			{
+				this->Warning("Missing or invalid warning message");
+			}
+		}
 		else if (mToken == TK_PREP_IDENT)
 		{
 			Macro* def = nullptr;
@@ -1149,6 +1178,10 @@ void Scanner::NextSkipRawToken(void)
 
 				if (!strcmp(tkprep, "define"))
 					mToken = TK_PREP_DEFINE;
+				else if (!strcmp(tkprep, "error"))
+					mToken = TK_PREP_ERROR;
+				else if (!strcmp(tkprep, "warning"))
+					mToken = TK_PREP_WARN;
 				else if (!strcmp(tkprep, "undef"))
 					mToken = TK_PREP_UNDEF;
 				else if (!strcmp(tkprep, "include"))
@@ -1537,6 +1570,10 @@ void Scanner::NextRawToken(void)
 
 				if (!strcmp(tkprep, "define"))
 					mToken = TK_PREP_DEFINE;
+				else if (!strcmp(tkprep, "error"))
+					mToken = TK_PREP_ERROR;
+				else if (!strcmp(tkprep, "warning"))
+					mToken = TK_PREP_WARN;
 				else if (!strcmp(tkprep, "undef"))
 					mToken = TK_PREP_UNDEF;
 				else if (!strcmp(tkprep, "include"))
diff --git a/oscar64/Scanner.h b/oscar64/Scanner.h
index 52d39df..daea112 100644
--- a/oscar64/Scanner.h
+++ b/oscar64/Scanner.h
@@ -141,6 +141,8 @@ enum Token
 	TK_PREP_ENDIF,
 	TK_PREP_IFDEF,
 	TK_PREP_IFNDEF,
+	TK_PREP_ERROR,
+	TK_PREP_WARN,
 	TK_PREP_PRAGMA,
 	TK_PREP_LINE,