Added some error checking.
2 files changed