Add none and empty frame checks