add some checks based on recent troubleshooting