Merge pull request #428 from jrperritt/cf-nil-pointer-fix

fix object storage nil pointer dereference error; Closes #427