added todo for error handler