MOE_02: Better empty/null/error handling