Fail condition tweaks.
Merge fix