Fix for null cert error on second submit.