Error checking (24/28)

Error checking