Adds error proofing for prod server