Fix #11, Fix #12. Error Detection.