Return rather than fail if resolution is not defined
Merge pull request #2527 from pagameba/cluster-fix

Return rather than fail if resolution is not defined