Added a fix for the NavModule

Should fix null pointer exceptions