Perhaps this TODO could be removed since the error is now logged?