WELD-1802 moved clearing of bean store and clean up to finally clause