handle exception
Merge branch '1.0-develop' of https://github.com/guillaume-delattre/JAVA into 1.0-develop