Update Objects Done, return null was changed for throw exceptions