Updated to use NoDatabaseError