Further bullet-proofing.

Closes #2.