dealing with errors a bit better...