Improved 'empty attachment handling' when feature is disabled (#236)

Improved 'empty attachment handling' when feature is disabled (#236) #206