Error handling on one line
Update TODO
Merge branch 'master' of github.com:donovanhide/ripple