Changed methods to better handle when no result is found.
Implemented null returns and corresponding null checks.