Merge branch 'fix-subscript-integality-check' into 'master'

Fix subscript integrality check to give a good error message if type inf fails

See merge request !411