Minor refactor and adds missing checkRC call