Missing docblocks
Wrong type in docblocks
Missing property
Added missing catch comments
Merge remote-tracking branch 'origin/master'