Minor correction.. actually I do not allow nulls to be returned, but I do limit the "fallback choices" to what they were previously. Only the OracleDialects this behavior so far.