Merge commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12' into eclair-mr2 * commit '4388b98845e6a28c689e500cd6ed1e9bb29a2c12': 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.