#485 - null check for rollback service