Better error message handing.