better error message - cleanup