Adds some defensiveness.
Release 1.3.1.