Develop

Fix error when saving nil value