I think error handling works 100% now