null check and persistence config change