Merge "Stopgap solution for a crash."