Error checking (21/28)

Error checking