diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java index 213ab7d7e6..3b33e7d50d 100755 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java @@ -4357,7 +4357,10 @@ public class Env { String currentDB = ctx.getDatabase(); if (StringUtils.isNotEmpty(currentDB)) { - catalogMgr.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB); + // When dropped the current catalog in current context, the current catalog will be null. + if (ctx.getCurrentCatalog() != null) { + catalogMgr.addLastDBOfCatalog(ctx.getCurrentCatalog().getName(), currentDB); + } } ctx.changeDefaultCatalog(catalogName); String lastDb = catalogMgr.getLastDB(catalogName);