Cleaned up error handling and uses of TRUE/FALSE.
2 files changed