Updated exception handling.
Updated exception handling.

Change-Id: I67b3a76eceea8d9a1f32331c45839b68c4594cf8

watermanio/Gaufrette,WayOfBrave/Gaufrette,NiR-/Gaufrette,jenkoian/Gaufrette,ronaldlopez/Gaufrette,Consoneo/Gaufrette,igormukhingmailcom/Gaufrette,NiR-/Gaufrette,1001Pharmacies/Gaufrette,peelandsee/Gaufrette,acucchieri/Gaufrette,ronaldlopez/Gaufrette,1001Pharmacies/Gaufrette,jenkoian/Gaufrette,KnpLabs/Gaufrette,alex88/Gaufrette,alex88/Gaufrette,watermanio/Gaufrette,KnpLabs/Gaufrette,igormukhingmailcom/Gaufrette,acucchieri/Gaufrette,WayOfBrave/Gaufrette