Tweak PHPDocs and an exception message