Remove fake error handling