Avoid the 'state=null' coming back from the service module.
Make note about enablement bit