Removed unnecessary NameError rescue