Added exceptions to comment blocks