Better error handling on first run.