Additional error checking.
2 files changed