Revert "eliminated bug introduced with latest revision"
to cherry-pick an earlier patch first without conflict.

This reverts commit caefe1563c2c2bbd4cbf18979a94d581f88a2ef2.
fix check-satisfied to properly deal with errors in predicate check

(cherry picked from commit da98d60f99a6d9b76f0b37aa30ed07a0427516bb)
eliminated bug introduced with latest revision

please add to 6.1.1.

(cherry picked from commit 538bb75d646b42acbdf98a762687419707f4f5dc)