Skip to content

Fix up null issue

Fix up null issue #118