This updates also some doctstrings related to exception handling Change-Id: If9903e66f187b837e238cb5fcdd8cc8e819f22b6