Fix nevernull usage to prevent map errors