update loading and throw exceptions