Removed stupid error handling that doesn't even work