Corrected failure case bugs.