Fixed bug in types module, leading to a wrong Exception message.
Merge branch 'develop' into feature-ppms