add additional protections until production is ready