2013-05-14, exceptions improvements