diff --git a/src/openrct2/actions/LargeSceneryPlaceAction.cpp b/src/openrct2/actions/LargeSceneryPlaceAction.cpp
index 5371ad529e..832afdd52e 100644
--- a/src/openrct2/actions/LargeSceneryPlaceAction.cpp
+++ b/src/openrct2/actions/LargeSceneryPlaceAction.cpp
@@ -75,18 +75,17 @@ GameActions::Result LargeSceneryPlaceAction::Query() const
         LOG_ERROR("Invalid primary colour %u", _primaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
     }
-    if (_secondaryColour >= COLOUR_COUNT)
+    else if (_secondaryColour >= COLOUR_COUNT)
     {
         LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
     }
-    if (_tertiaryColour >= COLOUR_COUNT)
+    else if (_tertiaryColour >= COLOUR_COUNT)
     {
         LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_POSITION_THIS_HERE, STR_ERR_INVALID_COLOUR);
     }
-
-    if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS)
+    else if (_sceneryType >= MAX_LARGE_SCENERY_OBJECTS)
     {
         LOG_ERROR("Invalid sceneryType %u", _sceneryType);
         return GameActions::Result(
diff --git a/src/openrct2/actions/LargeScenerySetColourAction.cpp b/src/openrct2/actions/LargeScenerySetColourAction.cpp
index c53dc3c00e..687a016b75 100644
--- a/src/openrct2/actions/LargeScenerySetColourAction.cpp
+++ b/src/openrct2/actions/LargeScenerySetColourAction.cpp
@@ -78,14 +78,12 @@ GameActions::Result LargeScenerySetColourAction::QueryExecute(bool isExecuting)
         LOG_ERROR("Invalid primary colour %u", _primaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
     }
-
-    if (_secondaryColour >= COLOUR_COUNT)
+    else if (_secondaryColour >= COLOUR_COUNT)
     {
         LOG_ERROR("Invalid secondary colour %u", _secondaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
     }
-
-    if (_tertiaryColour >= COLOUR_COUNT)
+    else if (_tertiaryColour >= COLOUR_COUNT)
     {
         LOG_ERROR("Invalid tertiary colour %u", _tertiaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
diff --git a/src/openrct2/actions/ParkSetDateAction.cpp b/src/openrct2/actions/ParkSetDateAction.cpp
index 9df4808a6a..fdd0ab99ef 100644
--- a/src/openrct2/actions/ParkSetDateAction.cpp
+++ b/src/openrct2/actions/ParkSetDateAction.cpp
@@ -51,13 +51,13 @@ GameActions::Result ParkSetDateAction::Query() const
         return GameActions::Result(
             GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
     }
-    if (_month < 0 || _month >= MONTH_COUNT)
+    else if (_month < 0 || _month >= MONTH_COUNT)
     {
         LOG_ERROR("Invalid park date month %d", _year);
         return GameActions::Result(
             GameActions::Status::InvalidParameters, STR_ERR_INVALID_PARAMETER, STR_ERR_VALUE_OUT_OF_RANGE);
     }
-    if (_day < 0 || _day >= 31)
+    else if (_day < 0 || _day >= 31)
     {
         LOG_ERROR("Invalid park date day %d", _year);
         return GameActions::Result(
diff --git a/src/openrct2/actions/WallSetColourAction.cpp b/src/openrct2/actions/WallSetColourAction.cpp
index 2b0583b91c..6754f37b0c 100644
--- a/src/openrct2/actions/WallSetColourAction.cpp
+++ b/src/openrct2/actions/WallSetColourAction.cpp
@@ -99,14 +99,12 @@ GameActions::Result WallSetColourAction::Query() const
         LOG_ERROR("Primary colour invalid: colour = %d", _primaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
     }
-
-    if (_secondaryColour >= COLOUR_COUNT)
+    else if (_secondaryColour >= COLOUR_COUNT)
     {
         LOG_ERROR("Secondary colour invalid: colour = %d", _secondaryColour);
         return GameActions::Result(GameActions::Status::InvalidParameters, STR_CANT_REPAINT_THIS, STR_ERR_INVALID_COLOUR);
     }
-
-    if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR)
+    else if (wallEntry->flags & WALL_SCENERY_HAS_TERTIARY_COLOUR)
     {
         if (_tertiaryColour >= COLOUR_COUNT)
         {