Fixed erroneous exception
Merge branch 'dev' of https://github.com/dashrendar102/ByuModern.git