Checking for the latest object count, not a possibly stale one.
Whitespace fixes to appease the linter and my OCD.
Fixing exception message.
Merge pull request #498 from ycombinator/pr490-tweaks

Tweaks to PR 490