TRUNK-3010 - Fix error with non-existent patient id