Add correct error and todo messages.