Fixes #1 - Added in param checking on the lookup function