Fix error that makes node crash due to db crashing
Merge branch 'master' of github.com:alexchantavy/UH-Class-Search-2
integrate george's cleanup