Failed evaluation now returns proper code