Co-authored-by: Erika <3019731+Princesseuh@users.noreply.github.com>
Fix "Cannot read properties of null" error in CLI code