diff --git a/classify/adaptmatch.cpp b/classify/adaptmatch.cpp
index 5ea8a49ce4..e4713a04f5 100644
--- a/classify/adaptmatch.cpp
+++ b/classify/adaptmatch.cpp
@@ -819,7 +819,7 @@ int Classify::GetAdaptiveFeatures(TBLOB *Blob,
   Features = ExtractPicoFeatures(Blob);
 
   NumFeatures = Features->NumFeatures;
-  if (NumFeatures > UNLIKELY_NUM_FEAT) {
+  if (NumFeatures == 0 || NumFeatures > UNLIKELY_NUM_FEAT) {
     FreeFeatureSet(Features);
     return 0;
   }