Fix error error, and bad handling