#45 Added Validity-Check for Database