to be merged
wtf?
Handled a particular error.
Derp. Fix missing constant post rename