refactor: handle undefined container variable
refactor: handle undefined container variable