Fixed a tiny bug with error catching, updated todo