Merge "Fix for SATIZENVUL-1655 & SATIZENVUL-1656 - error handling" into tizen