Further work on atoms
New proposed text for error handling