Handle some errors a little more gracefully.