Fixed (some) exceptions