CORE-4671:
* More corrections to side error issue.