More crash prevention