JSR_308 - Fix for target location and catch variable attribute
5 files changed