Address the getId being NULL issue

Relates to issue #12