small updates to fix exceptional expression case.