Fixing null pointer database hang + 15 Min

Also reduced timeout due to heavy traffic