updated AccountAdapter, added better model error handling
updated AccountAdapter