Make app not crash again