Added better AttributeError handling