Add extra error handling for swr1