Do not crash when @Embedded field is null

@chalup fast commit, review please if it behaves like it should and then I'll divide it into two separated commits.