Don't use displayName if it's empty (should fix #819)