KIBANA-1 : Exceptions management improvments