Add additional HTTPS checking per Teppo's issue #376