Merge "Modified exception code" into tizen_2.2