Handle errors a tiny bit better.