More error-handling for more better.