Added pass one error checking