diff --git a/ft8/ft8.cpp b/ft8/ft8.cpp
index b11c09604..aa9d09b97 100644
--- a/ft8/ft8.cpp
+++ b/ft8/ft8.cpp
@@ -1938,6 +1938,10 @@ void FT8::soft_decode(const FFTEngine::ffts_t &c79, float ll174[])
 //
 void FT8::soft_decode_mags(FT8Params& params, const std::vector<std::vector<float>>& mags_, int nbSymbolBits, float ll174[])
 {
+    if (nbSymbolBits > 16) {
+        return;
+    }
+
     std::vector<std::vector<float>> mags = convert_to_snr_gen(params, nbSymbolBits, mags_);
     // statistics to decide soft probabilities.
     // distribution of strongest tones, and
diff --git a/plugins/channelrx/demoddatv/ldpctool/encoder.h b/plugins/channelrx/demoddatv/ldpctool/encoder.h
index fc1e07788..2c8fbd7bd 100644
--- a/plugins/channelrx/demoddatv/ldpctool/encoder.h
+++ b/plugins/channelrx/demoddatv/ldpctool/encoder.h
@@ -30,7 +30,7 @@ namespace ldpctool {
 template <typename TYPE>
 class LDPCEncoder
 {
-	LDPCInterface *ldpc;
+	LDPCInterface *ldpc = nullptr;
 	int N = 2;
     int K = 1;
     int R = 1;