More Cleaning

Added better Error messages