Removed duplicated defensive checking