Added support for None returns from database

Added support for None returns from database