base

Merge change Idc4c7714 into eclair

* changes:
  Revert the changes that introduced new exception that wouldn't have occured before, applications don't seem to be able to handle them and we get crashes.