Catch NoSuchFieldException instead of NoSuchFieldError (#10944)

Change-Id: I0ece22fc53388a7c9eb268c00ae46c589859a1f1