Correction - it seems that @OneToOne( ..., optional=false) does not have the effect I thought it did. That's definitely something we could do though