Fixed NameError handling