Removing exception not thrown anymore and the corresponding try/catch
This is due to the fact that we are using EJB 3 locally and thus we have a cleaner exception model
Fix merge conflicts