Correct a faulty address assignment, and add a length check (not

really needed now, but may be needed in the future, who knows?).