Correct crash in production env