Test commit with minor changes in exceptions and comments

Hi Ferosh, Just to test if I am doing right with Git. Hope everything is OK. Please let me know. You may also ignore this commit.