Add error-handling and spec lines.