Issue #1380480 by chrisarcher2188: Fixed Server Error. Issue #1373436 by adamcian: Fixed Fatal Error if Devel module not installed.