Fix for #6 - NPE when secrets are not initialized yet