Cleaned up the docblocks and exception messages a bit to comply with Scrutinizer output