1 files changed, 6 insertions, 1 deletions
diff --git a/api/src/glfs.c b/api/src/glfs.c
index babaf20cee3..7b2a10dfa63 100644
--- a/api/src/glfs.c
+++ b/api/src/glfs.c
@@ -1221,13 +1221,18 @@ pub_glfs_fini(struct glfs *fs)
 
     DECLARE_OLD_THIS;
 
-    __GLFS_ENTRY_VALIDATE_FS(fs, invalid_fs);
+    if (!fs) {
+        errno = EINVAL;
+        goto invalid_fs;
+    }
 
     ctx = fs->ctx;
     if (!ctx) {
         goto free_fs;
     }
 
+    THIS = fs->ctx->master;
+
     if (ctx->mgmt) {
         rpc_clnt_disable(ctx->mgmt);
     }