2.0.7.0 (More error handling)