1e68c48 introduces ASSERT errors on some models

[ajc158]

I've just tried the latest Master, and I can't load any models due to ASSERT errors for Generic Inputs. Will have a deeper look in a bit, but flagging this here as a placeholder