Untested Fix of Weekend Bug

App crashed on weekends. This is an attempted fix. I can't test it here.