Issue #37 - Remove unnecessary TODO and add printStackTrace in a catch block.