Add Exception Thrown on not supported resolution
Merge branch 'add-beta-options'