Added extra guard for invalid information