update version to 3.6.0-M3-SNAPSHOT
Refactoring constants and throwing correct exception