Fixed persistance Issue of null objects