Fixes #15344 - recover from fingerprint error on validation
(cherry picked from commit edb839629c94822c387b340f2db5e1efb8106ea8)
Fixes #15344 - recover from fingerprint error on validation
(cherry picked from commit edb839629c94822c387b340f2db5e1efb8106ea8)