Fix getCurve throws error instead of returning undefined
Merge branch 'public'