diff --git a/modules/features2d/src/akaze/AKAZEFeatures.cpp b/modules/features2d/src/akaze/AKAZEFeatures.cpp
index 27d5692d3..4f33508fc 100644
--- a/modules/features2d/src/akaze/AKAZEFeatures.cpp
+++ b/modules/features2d/src/akaze/AKAZEFeatures.cpp
@@ -96,12 +96,12 @@ void AKAZEFeatures::Allocate_Memory_Evolution(void) {
 int AKAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat& img) {
 
     //double t1 = 0.0, t2 = 0.0;
-
-    if (evolution_.size() == 0) {
-        cerr << "Error generating the nonlinear scale space!!" << endl;
-        cerr << "Firstly you need to call AKAZEFeatures::Allocate_Memory_Evolution()" << endl;
-        return -1;
-    }
+    CV_Assert(evolution_.size() > 0);
+    //if (evolution_.size() == 0) {
+    //    cerr << "Error generating the nonlinear scale space!!" << endl;
+    //    cerr << "Firstly you need to call AKAZEFeatures::Allocate_Memory_Evolution()" << endl;
+    //    return -1;
+    //}
 
     //t1 = cv::getTickCount();
 
@@ -148,7 +148,7 @@ int AKAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat& img) {
             charbonnier_diffusivity(evolution_[i].Lx, evolution_[i].Ly, evolution_[i].Lflow, options_.kcontrast);
             break;
         default:
-            cerr << "Diffusivity: " << static_cast<int>(options_.diffusivity) << " is not supported" << endl;
+            CV_Error(options_.diffusivity, "Diffusivity is not supported");
             break;
         }
 
diff --git a/modules/features2d/src/kaze/KAZEFeatures.cpp b/modules/features2d/src/kaze/KAZEFeatures.cpp
index 78348f833..8d1b72663 100644
--- a/modules/features2d/src/kaze/KAZEFeatures.cpp
+++ b/modules/features2d/src/kaze/KAZEFeatures.cpp
@@ -139,11 +139,12 @@ int KAZEFeatures::Create_Nonlinear_Scale_Space(const cv::Mat &img) {
 
     //double t2 = 0.0, t1 = 0.0;
 
-    if (evolution_.size() == 0) {
-        cout << "Error generating the nonlinear scale space!!" << endl;
-        cout << "Firstly you need to call KAZE::Allocate_Memory_Evolution()" << endl;
-        return -1;
-    }
+    CV_Assert(evolution_.size() > 0);
+    //if (evolution_.size() == 0) {
+    //    cout << "Error generating the nonlinear scale space!!" << endl;
+    //    cout << "Firstly you need to call KAZE::Allocate_Memory_Evolution()" << endl;
+    //    return -1;
+    //}
 
     //t1 = getTickCount();