Add check, fix error throwing breaking everything.