diff --git a/Marlin/pins_GEN6.h b/Marlin/pins_GEN6.h
index 5611e4d92..1c5e2069a 100644
--- a/Marlin/pins_GEN6.h
+++ b/Marlin/pins_GEN6.h
@@ -51,10 +51,8 @@
  *
  */
 
-#ifndef __AVR_ATmega644P__
-  #ifndef __AVR_ATmega1284P__
-    #error "Oops!  Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
-  #endif
+#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
+  #error "Oops!  Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu."
 #endif
 
 #ifndef BOARD_NAME
diff --git a/Marlin/pins_GT2560_REV_A_PLUS.h b/Marlin/pins_GT2560_REV_A_PLUS.h
index b722c04fd..7eed3b859 100644
--- a/Marlin/pins_GT2560_REV_A_PLUS.h
+++ b/Marlin/pins_GT2560_REV_A_PLUS.h
@@ -26,6 +26,7 @@
 
 #include "pins_GT2560_REV_A.h"
 
+#undef BOARD_NAME
 #define BOARD_NAME  "GT2560 Rev.A+"
 
 #define SERVO0_PIN  11