Exception thown in the menu part in some cases when the current page is null.
Merge pull request #419 from petedavis/menu_enhancements

Exception thrown in the menu part in some cases