handle issues with staging server