Add some extra error cases