Store exceptions on Step
Added some unit tests