Error checking (26/28)

Error checking