Make sure to always correctly reference ArgumentNullException

Fixes #5

Supersedes #11