[5.0] Fixed docblocks and try/catch alignment