Merge branch 'isdn-null-deref'