Prevent NPE on disable when the external database is not enabled
Merge pull request #9 from zreed/master

Prevent NPE on disable when the external database is not enabled