Cleanup and null value handle