Fix Bug 2158 and Bug 2254 by arranging exception handling
Change-Id: Id84e57944258536735eb114d4c77f471d700e1aa
Signed-off-by: gatici <gulsum.atici@canonical.com>
Change-Id: Id84e57944258536735eb114d4c77f471d700e1aa
Signed-off-by: gatici <gulsum.atici@canonical.com>