Added exceptions due to changes in last commit