cleanup + cleaner error message