replace Exception with WP_Error error handling in 2 places.
PHP Docblock
Merge branch 'master' into use-wp-error-292

get latest commits
replace more exceptions
replace last Exception
fixes unmatched closing parenthesis and docblock
Merge pull request #292 from humanmade/use-wp-error-292

Replace exceptions with WP_Error