Added some exception handling

Next step :
- implemente a content provider