More standardization and error handling.