Change to requiring non-null