am 770dc6e5: am 492dbe17: am 4388b988: Merge change Idc4c7714 into eclair

Merge commit '770dc6e5890c70af2b176770539d4afd4e904ff5'

* commit '770dc6e5890c70af2b176770539d4afd4e904ff5':
  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.