Fixed few exceptions in last commit.