1 files changed, 3 insertions, 1 deletions
diff --git a/src/schema_features.c b/src/schema_features.c
index 9f6c368..5552267 100644
--- a/src/schema_features.c
+++ b/src/schema_features.c
@@ -105,7 +105,7 @@ lys_identity_iffeature_value(const struct lysc_ident *ident)
     const struct lysp_ident *idents_p, *found_ident = NULL;
     struct lysp_include *includes;
 
-    assert(ident);
+    LY_CHECK_ARG_RET(NULL, ident, ident->module->parsed, LY_EINVAL);
 
     /* Search parsed identity in the module. */
     idents_p = ident->module->parsed->identities;
@@ -146,6 +146,8 @@ lysp_feature_next(const struct lysp_feature *last, const struct lysp_module *pmo
 {
     struct lysp_feature *features;
 
+    LY_CHECK_ARG_RET(NULL, pmod, NULL);
+
     if (!*idx) {
         /* module features */
         features = pmod->features;