Fixing #627. Making sure all possible exception paths are covered. Totally... Closes #627 See merge request !224