Revert "Replace PgpGeneralException with NotFoundException where appropriate"

This reverts commit 49b4ff63122988dc1587844e6b4b2ee5d0855385.