Last commit broke compilation error handling - fixed.