Revert "possible fix if verify_/get_secret return None"

This reverts commit 47f9a0a5f7c3926008a0cef3ac6d6daac0a02110.