Clean up null chunks handling