Fixed error handling and TRUE/FALSE usage.
2 files changed