Issue #24: cleanup to remove TODOs, new exceptions, and catching exceptions