Commit to lessen crashes.

Fixes crashes.