BUG-1027: rework lookup for clarity

This patch gets rid of the nasty 'catch Exception', making the lookup
fail as soon as a DeserializationException is thrown. We account for
most of the checked exceptions, so this should not be a problem.

Change-Id: I3d0440933ebc30ba32a06690ebe326e18addf613
Signed-off-by: Robert Varga <rovarga@cisco.com>
Merge "BUG-1027: rework lookup for clarity"