Another uncaught error from last big commit. Getting too last in the night.