Avoid crash when pulling curve of empty class (take 2)