early hours of Wed - need to handle keystore erro next