belt-and-braces, check for short read

Change-Id: Iade0f68621f549895bd8fb8dc46c71c70aa5a13e