Resolving bnc#835726, problem with raise exeption

Change-Id: I73f9d631cef6f98014a750b53f7403fcf4cdac9b