Forgot some return statements in case the controller isn't connected