Combine two exception to a single except
Add multi degree support