Minor tweaks
Updated custom error system
Removed custom error system