C-style comments and add error checking.