Fixed bugs relating to improper error messages as well as completing the
refactoring necessary for UI reintegration.