Fix Issue #357 & better checking to detect when an constant expression is valid