PMGR-4819 - Addresses a few more bugs:
 * If there are no restricted fields, we don't need to query the
database, but that resulted in us concluding that the record didn't
exist and raised an exception
 * Boolean error in testing to see if we could exit methods early