Fix for #982 - null pointer on setting start/stop menu item

This should fix #982