More error handling & stability