Added Greg's changes and began working on a try/catch to create list of
exception entities