fix: tiny issue and exception issue