front end changes to handle None from the datastore
Merge pull request #239 from anubhavsinha/#233_fron_end_changes

front end changes to handle None from the datastore