handle exception
Merge branch 'master' of https://github.com/PellegriniBaptiste/webengine3A.git
clean the code