Resolve error "Creating default object from empty value"
Merge pull request #2 from aduth/patch-1

Resolve error "Creating default object from empty value"