Prevent errors when calling getParent
Merge branch 'issue-80' into dev