Bugfix: Handle empty properties properly when framing