Finish to implement errors, according to #16