Made some changes to catch missing attributes