Fixed:Small omissions in error handling changes