diff --git a/lib/pam_getenvlist.c b/lib/pam_getenvlist.c
index ad72e7f..fd21faa 100644
--- a/lib/pam_getenvlist.c
+++ b/lib/pam_getenvlist.c
@@ -73,6 +73,8 @@ pam_getenvlist(pam_handle_t *pamh)
 			return (NULL);
 		}
 	}
+	envlist[i] = NULL;
+	openpam_log(PAM_LOG_DEBUG, "returning %d variables\n", pamh->env_count);
 	return (envlist);
 }