diff --git a/Common/Serialize/SerializeSet.h b/Common/Serialize/SerializeSet.h
index 7e22f21e56..642b0dc6bb 100644
--- a/Common/Serialize/SerializeSet.h
+++ b/Common/Serialize/SerializeSet.h
@@ -46,9 +46,8 @@ void DoSet(PointerWrap &p, std::set<T> &x) {
 			Do(p, *itr++);
 	}
 	break;
-
-	default:
-		ERROR_LOG(SAVESTATE, "Savestate error: invalid mode %d.", p.mode);
+	case PointerWrap::MODE_NOOP:
+		break;
 	}
 }
 
diff --git a/Common/Serialize/Serializer.cpp b/Common/Serialize/Serializer.cpp
index c9fb6457c2..71f5168c3b 100644
--- a/Common/Serialize/Serializer.cpp
+++ b/Common/Serialize/Serializer.cpp
@@ -171,6 +171,7 @@ void Do(PointerWrap &p, std::string &x) {
 	case PointerWrap::MODE_READ: x = (char*)*p.ptr; break;
 	case PointerWrap::MODE_WRITE: memcpy(*p.ptr, x.c_str(), stringLen); break;
 	case PointerWrap::MODE_MEASURE: break;
+	case PointerWrap::MODE_NOOP: break;
 	case PointerWrap::MODE_VERIFY: _dbg_assert_msg_(!strcmp(x.c_str(), (char*)*p.ptr), "Savestate verification failure: \"%s\" != \"%s\" (at %p).\n", x.c_str(), (char *)*p.ptr, p.ptr); break;
 	}
 	(*p.ptr) += stringLen;
@@ -198,6 +199,7 @@ void Do(PointerWrap &p, std::wstring &x) {
 	case PointerWrap::MODE_READ: x = read(); break;
 	case PointerWrap::MODE_WRITE: memcpy(*p.ptr, x.c_str(), stringLen); break;
 	case PointerWrap::MODE_MEASURE: break;
+	case PointerWrap::MODE_NOOP: break;
 	case PointerWrap::MODE_VERIFY: _dbg_assert_msg_(x == read(), "Savestate verification failure: \"%ls\" != \"%ls\" (at %p).\n", x.c_str(), read().c_str(), p.ptr); break;
 	}
 	(*p.ptr) += stringLen;
@@ -225,6 +227,7 @@ void Do(PointerWrap &p, std::u16string &x) {
 	case PointerWrap::MODE_READ: x = read(); break;
 	case PointerWrap::MODE_WRITE: memcpy(*p.ptr, x.c_str(), stringLen); break;
 	case PointerWrap::MODE_MEASURE: break;
+	case PointerWrap::MODE_NOOP: break;
 	case PointerWrap::MODE_VERIFY: _dbg_assert_msg_(x == read(), "Savestate verification failure: (at %p).\n", p.ptr); break;
 	}
 	(*p.ptr) += stringLen;
diff --git a/Core/MemMap.cpp b/Core/MemMap.cpp
index 52ef9ff5f9..50a2d564fa 100644
--- a/Core/MemMap.cpp
+++ b/Core/MemMap.cpp
@@ -335,6 +335,8 @@ static void DoMemoryVoid(PointerWrap &p, uint32_t start, uint32_t size) {
 				_dbg_assert_msg_(d[i] == storage[i], "Savestate verification failure: %d (0x%X) (at %p) != %d (0x%X) (at %p).\n", d[i], d[i], &d[i], storage[i], storage[i], &storage[i]);
 		}, 0, size, 128);
 		break;
+	case PointerWrap::MODE_NOOP:
+		break;
 	}
 	storage += size;
 }