Added TODOs for try blocks server-side, relates to #95
Removed unnecessary TODO from test.
Removed unnecessary TODOs.