Update README and CONTRIBUTING
Catch more specific exception
Add TODO items