Initial commit and error handling