Crash Fix

- Fixes an issue with crashes on startup.