Error messages should include the problematic input whenever possible (Disk strings)

For example:

Disk strings should be of the format 'local-disk SIZE TYPE' or '/mount/point SIZE TYPE'

should be
Disk strings should be of the format 'local-disk SIZE TYPE' or '/mount/point SIZE TYPE'. Found 'foo'