diff --git a/src/Server.cpp b/src/Server.cpp
index dfc932c674..fe503926de 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -378,6 +378,9 @@ bool LyXComm::pipeServer()
 			if (!resetPipe(i, !success))
 				return false;
 			break;
+		case CONNECTING_STATE:
+			LYXERR0("Wrong pipe state");
+			break;
 		}
 	}
 
diff --git a/src/insets/ExternalSupport.cpp b/src/insets/ExternalSupport.cpp
index 24a228cb55..33c14d38be 100644
--- a/src/insets/ExternalSupport.cpp
+++ b/src/insets/ExternalSupport.cpp
@@ -480,6 +480,8 @@ string const substituteIt<TransformOption>(string const & input,
 	case Resize:
 		ptr = store.getOptionTransformer(params.resizedata);
 		break;
+	case None:
+		break;
 	}
 
 	if (!ptr)