Fall back to check cert if no pub key is found

Fall back to check cert if no pub key is found #599