Crash check added...