(fix) Add extra checks for if getSubType method is not present on an entity and if no attachment present to propagate to - Fixes #904
