Added errors
Patched it up