Latest amendment - v1.2

Better error handling.