Added in tests for null cases, IllegalStateExceptions, and hard to hit cases
Merge pull request #13 from kpartlow/master

Added in tests for null cases, IllegalStateExceptions, and hard to hit c...