Another stab at issue #10. Now checking for length.