diff --git a/git-teaspeak b/git-teaspeak
index 8e78748..4c4c216 160000
--- a/git-teaspeak
+++ b/git-teaspeak
@@ -1 +1 @@
-Subproject commit 8e7874872ebb2c19dda702bc68372da5eea77e99
+Subproject commit 4c4c2161722469fffebc5dbb0411af884d3b709e
diff --git a/server/CMakeLists.txt b/server/CMakeLists.txt
index f149ee6..15f4e6d 100644
--- a/server/CMakeLists.txt
+++ b/server/CMakeLists.txt
@@ -3,7 +3,7 @@ project(TeaSpeak-Server)
 
 set(CMAKE_VERBOSE_MAKEFILE ON)
 #--allow-multiple-definition
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wall -Wno-reorder -Wno-sign-compare -static-libgcc -static-libstdc++ -g -Wl,--no-whole-archive -pthread ${MEMORY_DEBUG_FLAGS} -Werror=return-type")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive -Wall -Wno-reorder -Wno-sign-compare -static-libgcc -static-libstdc++ -g -Wl,--no-whole-archive -pthread ${MEMORY_DEBUG_FLAGS} -Werror=return-type -Werror=delete-non-virtual-dtor")
 set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -O3")
 
diff --git a/server/src/client/shared/ServerCommandExecutor.h b/server/src/client/shared/ServerCommandExecutor.h
index f0f2d74..d3851c3 100644
--- a/server/src/client/shared/ServerCommandExecutor.h
+++ b/server/src/client/shared/ServerCommandExecutor.h
@@ -23,6 +23,7 @@ namespace ts::server {
 
         public:
             ServerCommandHandler() = default;
+            virtual ~ServerCommandHandler() = default;
 
         protected:
             /**