6.77: added additional safety checks to Resolve module.