update TODO
properly implement exception handling
update description
properly implement exception handling