No more Pokemon style exception handling (closes #412)