Made TheaterController safe