Improve exception handling - replace generic Exception with specific types

Improve exception handling - replace generic Exception with specific types #1207