Fixed an embarrassing merge error from waaay back. Didn't disrupt operation but caused funny error messages in the log.

Thanks to @nophead for reporting this.

Closes #433