removing crash handling for now