5s timeout added & proper error handling, refs #15