Merge "Add error-check when mapping socket to fd"