I would recommend simply moving the statement `return rs` on line 97 here. In practice `return null` would likely never be executed, but returning null is misleading (as it mislead me in making my initial comment).