Added checking for no agent properties