Improved error handling (resolves #6)