Error checking (16/28)

Error checking