Updates to check for null an 0 limit