TUSCANY-3667 - Reverting usage of generics and just catching the exception to avoid performance implications on regular environments