Don't exception on dataform headline message

Last pushes before I start on the caching layer.