Add check for null limits.
Fix and further simpplify config presistence.