Improved handling of the null device