cleaning up
adding exception handling on DAO