added checks for nothing