Change Atom with new handle of error