Merge "Better error handling for webkit classes" into main