Added a todo. Looking for an elegant way to bubble up the error.