Cleaner errors, still needs some work