Remove error if undefined
Merge branch 'fix-error'