diff --git a/src/gfx/proto_palette.cpp b/src/gfx/proto_palette.cpp
index 4b63408e..faa0bb5c 100644
--- a/src/gfx/proto_palette.cpp
+++ b/src/gfx/proto_palette.cpp
@@ -46,7 +46,7 @@ ProtoPalette::ComparisonResult ProtoPalette::compare(ProtoPalette const &other)
 	auto ours = _colorIndices.begin(), theirs = other._colorIndices.begin();
 	bool weBigger = true, theyBigger = true;
 
-	while (ours != _colorIndices.end() && theirs != other._colorIndices.end()) {
+	while (ours != end() && theirs != other.end()) {
 		if (*ours == *theirs) {
 			++ours;
 			++theirs;
@@ -58,8 +58,8 @@ ProtoPalette::ComparisonResult ProtoPalette::compare(ProtoPalette const &other)
 			weBigger = false;
 		}
 	}
-	weBigger &= theirs == other._colorIndices.end();
-	theyBigger &= ours == _colorIndices.end();
+	weBigger &= theirs == other.end();
+	theyBigger &= ours == end();
 
 	return theyBigger ? THEY_BIGGER : (weBigger ? WE_BIGGER : NEITHER);
 }
diff --git a/test/gfx/at-file-ref.err b/test/gfx/at-file-ref.err
index 3067cdc0..f480fa6e 100644
--- a/test/gfx/at-file-ref.err
+++ b/test/gfx/at-file-ref.err
@@ -1,14 +1,8 @@
-error: Failed to fit tile colors [$7f55, $7fff] in specified palettes
-error: Failed to fit tile colors [$7f55] in specified palettes
 error: Failed to fit tile colors [$6c8a, $7f55, $7fff] in specified palettes
-error: Failed to fit tile colors [$6c8a, $7fff] in specified palettes
-error: Failed to fit tile colors [$6c8a, $7f55] in specified palettes
-error: Failed to fit tile colors [$6c8a] in specified palettes
-error: Failed to fit tile colors [$7fff] in specified palettes
 note: The following palettes were specified:
         [$5f77, $213d, $41a6, $40ee]
         [$3f65, $36b3, $262a, $50b0]
         [$53c3, $3f65, $36b3]
         [$5f77, $267c, $41a6]
         [$267c, $213d, $40ee]
-Conversion aborted after 7 errors
+Conversion aborted after 1 error
diff --git a/test/gfx/bad_manual_pals.err b/test/gfx/bad_manual_pals.err
index c75d88d3..0815a1ff 100644
--- a/test/gfx/bad_manual_pals.err
+++ b/test/gfx/bad_manual_pals.err
@@ -1,6 +1,5 @@
 error: Failed to fit tile colors [$6c8a, $7f55, $7fff] in specified palettes
-error: Failed to fit tile colors [$6c8a, $7f55] in specified palettes
 note: The following palettes were specified:
         [$7fff, $7f55]
         [$7fff, $6c8a]
-Conversion aborted after 2 errors
+Conversion aborted after 1 error