Fallback to just_name if safe_id is falsey

Fixes #32