added 2 new error types
merged