Operation server was not returning in error cases
Merge pull request #516 from smarterclayton/operation_server_not_returning

Operation server was not returning in error cases