EAGLESIX-2688 Minor changes. Added error codes to some Errors. Commented out a duplicate method.