Add in error handling plus correct invocation.