Better error handling at start