Error checking (20/28)

Error checking