Improve init error handling