diff --git a/repmgr-action-node.c b/repmgr-action-node.c
index 74a0f9ff..f9f22cfb 100644
--- a/repmgr-action-node.c
+++ b/repmgr-action-node.c
@@ -1526,6 +1526,7 @@ do_node_check_upstream(PGconn *conn, OutputMode mode, t_node_info *node_info, Ch
 					   output_check_status(status),
 					   details.data);
 			}
+			break;
 		case OM_TEXT:
 			if (list_output != NULL)
 			{
diff --git a/repmgr-client.c b/repmgr-client.c
index f16dd117..737e6fa8 100644
--- a/repmgr-client.c
+++ b/repmgr-client.c
@@ -712,9 +712,12 @@ main(int argc, char **argv)
 				if (strcmp(argv[optind - 1], "-?") == 0)
 				{
 					help_option = true;
-					break;
 				}
-				/* otherwise fall through to default */
+				else
+				{
+					option_error_found = true;
+				}
+				break;
 			default:    /* invalid option */
 				option_error_found = true;
 				break;
diff --git a/repmgrd-physical.c b/repmgrd-physical.c
index 9e412947..aa6d1188 100644
--- a/repmgrd-physical.c
+++ b/repmgrd-physical.c
@@ -202,6 +202,7 @@ do_physical_node_check(void)
 										  "node is inactive and cannot be used as a failover target");
 
 				terminate(ERR_BAD_CONFIG);
+				break;
 
 			case FAILOVER_MANUAL:
 				log_warning(_("this node is marked as inactive and will be passively monitored only"));