Merge "Bugfix, handling of empty types"