Removed old debug lines
Made error output generic