Added a todo
Fixed checking for error