Update for the embedded object generation - added null pointer check.
Update for the embedded object generation - added null pointer check.

mchasal/SFCB,kkaempf/sblim-sfcb,buccella/SFCB,buccella/SFCB,mchasal/SFCB,kkaempf/sblim-sfcb,buccella/SFCB,kkaempf/sblim-sfcb,mchasal/SFCB,kkaempf/sblim-sfcb,mchasal/SFCB,buccella/SFCB,kkaempf/sblim-sfcb,buccella/SFCB