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