Merged calqlator
Merged
Merge branch 'stable'
Modified Exception handling