Fixed uninitialized constant issue with errors
Merge remote-tracking branch 'upstream/develop'