Throw RuntimeException instead of returning null and causing NPE
Merge branch 'retrieveee'