Exceptions fixs

Change-Id: I8895417aab5588942ffb65eaf5c5b6b5e5ba31e4
Signed-off-by: Andrey Shamis <lolnik@gmail.com>