Moved simple error-checking to makestuff.h