Improved handling of null-extension case