Fixed throws docs
Fixed various docblocks
Merge pull request #5083 from GrahamCampbell/4.2-throws

[4.2] Fixed Throws Docblocks