- Fixed issues with sqlite
- Chanched "== None" to "is None"