Changes to add error handling for Account creation.