more paths and error codes handled