Fixed search [refs #17]
Started error handling [refs #24]