Here's a suggestion: 2d35a5a. This avoids this suspicious "return null".