Handle notready cases more properly