o.c.sds: fix npe
Merge remote-tracking branch 'Desy-extern/rel15x' into rel15x