Added undefined checker