Exception added
Merge from branhc