modifs guillaume + helper session
Custom error creation
Merge master & nma