Merge pull request #459 from peternewman/e1.37-2

Ensure we only return a valid length device label