fixed comments and added an additional exception