CLN: _axis_len checking cleanup and better message
Merge pull request #4855 from jreback/axis_len

CLN: _axis_len checking cleanup and better message