AI-406 : reverted dummy NPE fix and added logging on persistence failure