bug 1136: fixed returns and revoke_cert calls