Added missing cases for handling Thrown