fixed null pointer in cp construction
Merge remote-tracking branch 'origin/kel/base' into ldc/tipi