Beefed up error checking