Customer no longer crashes